Commit Graph

256054 Commits

Author SHA1 Message Date
Alyssa Ross
23d4bfb666
emacsWithPackages: don't tell sub-Emacs about pkgs
If I'm running an Emacs executable from emacsWithPackages as my main
programming environment, and I'm hacking on Emacs, or the Emacs
packaging in Nixpkgs, or whatever, I don't want the Emacs packages
from the wrapper to show up in the load path of that child Emacs.  It
results in differing behaviour depending on whether the child Emacs is
run from Emacs or from, for example, an external terminal emulator,
which is very surprising.

To avoid this, pass another environment variable containing the
wrapper site-lisp path, and use that value to remove the corresponding
entry in EMACSLOADPATH, so it won't be propagated to child Emacsen.
2020-12-10 22:52:31 +00:00
Alyssa Ross
0127013b0f
emacsWithPackages: mutate EMACSLOADPATH correctly
An empty entry in EMACSLOADPATH gets filled with the default value.
This is presumably why the wrapper inserted a colon after the entry it
added for the dependencies.  But this naive approach wasn't always
correct.

For example, if the user ran emacs with EMACSLOADPATH=foo, the wrapper
would insert the default value (by adding the trailing `:') even
though the user was trying to expressly opt out of it.

To do this correctly, here I've replaced makeWrapper with a bespoke
script that will actually parse the EMACSLOADPATH provided in the
environment (if given), and insert the wrapper's load path just before
the default value.  If EMACSLOADPATH is given but contains no default
value, we respect that and don't add the wrapped dependencies at all.
If no EMACSLOADPATH is given, we insert the wrapped dependencies
before the default value, just like before.  In this way, the wrapped
Emacs should now behave as if the wrapped dependencies were part of
Emacs's default load-path value.
2020-12-10 22:35:57 +00:00
Sandro
fa09aa8efd
Merge pull request #105620 from r-ryantm/auto-update/cinnamon-desktop
cinnamon.cinnamon-desktop: 4.6.4 -> 4.8.0
2020-12-02 01:51:18 +01:00
Sandro
b869b19e09
Merge pull request #105621 from r-ryantm/auto-update/clipgrab
clipgrab: 3.9.2 -> 3.9.5
2020-12-02 01:50:52 +01:00
Sandro
3b03bb1bce
Merge pull request #105623 from r-ryantm/auto-update/cinnamon-menus
cinnamon.cinnamon-menus: 4.6.1 -> 4.8.1
2020-12-02 01:50:28 +01:00
Sandro
1c064e77f4
Merge pull request #105624 from r-ryantm/auto-update/cinnamon-session
cinnamon.cinnamon-session: 4.6.2 -> 4.8.0
2020-12-02 01:49:27 +01:00
Sandro
726ed88b3e
Merge pull request #105630 from r-ryantm/auto-update/exodus
exodus: 20.11.21 -> 20.11.23
2020-12-02 01:47:10 +01:00
Martin Weinelt
66b96097f5
Merge pull request #105628 from zowoq/ytdl
youtube-dl: 2020.11.29 -> 2020.12.02
2020-12-02 01:45:42 +01:00
Sandro
9a925edb25
Merge pull request #105520 from lovesegfault/ideamaker 2020-12-02 01:43:53 +01:00
Sandro
52c501c102
Merge pull request #105608 from r-ryantm/auto-update/deja-dup
deja-dup: 42.5 -> 42.6
2020-12-02 01:34:25 +01:00
Sandro
6f52d0f572
Merge pull request #87735 from pmeiyu/master 2020-12-02 01:33:50 +01:00
Dmitry Kalinkin
d527419584
Merge pull request #105490 from veprbl/pr/dvisvgm_2_11
texlive.bin.dvisvgm: texlive 2.8.1 -> upstream 2.11
2020-12-01 18:56:51 -05:00
R. RyanTM
9e311226e7 exodus: 20.11.21 -> 20.11.23 2020-12-01 23:29:31 +00:00
zowoq
bc1ed39ffa youtube-dl: 2020.11.29 -> 2020.12.02
https://github.com/ytdl-org/youtube-dl/releases/tag/2020.12.02
2020-12-02 09:19:59 +10:00
R. RyanTM
54eed8ab5e cinnamon.cinnamon-session: 4.6.2 -> 4.8.0 2020-12-01 22:42:42 +00:00
R. RyanTM
14cd4982c6 cinnamon.cinnamon-menus: 4.6.1 -> 4.8.1 2020-12-01 22:15:38 +00:00
R. RyanTM
087c22d8f5 clipgrab: 3.9.2 -> 3.9.5 2020-12-01 21:54:26 +00:00
John Ericson
b1d16d8101
Merge pull request #105432 from tadfisher/remarkable-2-cross
Cross-compile configuration for reMarkable 2 tablet
2020-12-01 16:51:51 -05:00
Ryan Mulligan
16bf9276af
Merge pull request #105596 from 0x4A6F/master-dasel
dasel: 1.6.2 -> 1.8.0
2020-12-01 13:45:41 -08:00
R. RyanTM
50b6c206c3 cinnamon.cinnamon-desktop: 4.6.4 -> 4.8.0 2020-12-01 21:36:03 +00:00
Sarah Brofeldt
c06318e69f
Merge pull request #105244 from srhb/ceph-15.2.6
ceph: 15.2.5 -> 15.2.6
2020-12-01 22:16:22 +01:00
Vincent Laporte
8b64dfce2e ocamlPackages.bigstringaf: 0.6.0 → 0.7.0 2020-12-01 22:02:51 +01:00
Vincent Laporte
9e66b4e873 ocamlPackages.angstrom: use Dune 2 2020-12-01 22:02:51 +01:00
Vincent Laporte
38a91dff4d ocamlPackages.earlybird: use Dune 2 2020-12-01 22:02:51 +01:00
Vincent Laporte
11c35305ca ocamlPackages.ke: use Dune 2 2020-12-01 22:02:51 +01:00
Vincent Laporte
4569be3b21 coqPackages.coq-ext-lib: 0.11.2 → 0.11.3 2020-12-01 22:02:08 +01:00
Vincent Laporte
9366259691 coqPackages.coq-ext-lib: refactor 2020-12-01 22:02:08 +01:00
Milan
4617fcd6c4
edk2: 201911 -> 202011 (#105582) 2020-12-01 21:47:18 +01:00
Eelco Dolstra
330b44dced
Merge pull request #105612 from bbigras/nix
nixUnstable: pre20201118_79aa7d9 -> pre20201201_5a6ddb3
2020-12-01 20:59:06 +01:00
Bruno Bigras
2d1b0c3e88 nixUnstable: pre20201118_79aa7d9 -> pre20201201_5a6ddb3 2020-12-01 14:39:24 -05:00
Sandro
b52494940b
Merge pull request #105602 from r-ryantm/auto-update/appstream
appstream: 0.12.11 -> 0.13.1
2020-12-01 20:34:41 +01:00
R. RyanTM
602ee1b299 deja-dup: 42.5 -> 42.6 2020-12-01 19:08:34 +00:00
Andreas Rammhold
26cc536edf
Merge pull request #104203 from andir/saned-max-connections
nixos/sane: bump the MaxConnections to a reasonable amount
2020-12-01 19:45:13 +01:00
0x4A6F
a58e424290
dasel: 1.6.2 -> 1.8.0 2020-12-01 18:42:47 +00:00
Sandro
040f43d890
Merge pull request #104037 from kampka/toybox 2020-12-01 19:25:02 +01:00
edef
18db80f150
Merge pull request #105600 from edef1c/nix-prefetch-docker-stderr
nix-prefetch-docker: output informational messages to stderr
2020-12-01 18:24:16 +00:00
scalavision
919648ae9c
pylance: init at 2020.11.2 (#105601) 2020-12-01 19:13:42 +01:00
Joachim Breitner
fb063991b2
macdylibbundler: Should propagate dependency on otool (#103163)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2020-12-01 19:11:45 +01:00
James Earl Douglas
1a3557f729
archi: init at 4.7.1 (#103355)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2020-12-01 18:55:48 +01:00
Martin Weinelt
2d55b8def4 containerd: update commit id for version indicator
I forogt to update the `commit` value in 8884729, which is why this the
version output was wrong:

```
❯ ./result/bin/containerd -v
containerd github.com/containerd/containerd v1.4.3 7ad184331fa3e55e52b890ea95e65ba581ae3429
```

This change corrects it.

```
❯ ./result/bin/containerd -v
containerd github.com/containerd/containerd v1.4.3 269548fa27e0089a8b8278fc4fc781d7f65a939b
```
2020-12-01 18:55:01 +01:00
Sandro
123e83b171
Merge pull request #105603 from r-ryantm/auto-update/avocode
avocode: 4.10.3 -> 4.10.4
2020-12-01 18:54:50 +01:00
Sandro
bf94e2d5e7
Merge pull request #105599 from mcbeth/spigot
spigot: 20200101 -> 20200901
2020-12-01 18:52:19 +01:00
Jörg Thalheim
d7a5482a9d
Merge pull request #105500 from SuperSandro2000/bme680-linux
python3packages.bme680: Mark Linux only as upstream
2020-12-01 17:43:10 +00:00
R. RyanTM
c5c77eb0b1 avocode: 4.10.3 -> 4.10.4 2020-12-01 17:37:56 +00:00
Martin Weinelt
8cbe73118d
Merge pull request #105595 from mweinelt/containerd
containerd: 1.4.2 -> 1.4.3
2020-12-01 18:37:24 +01:00
StigP
d4b4ebd842
Merge pull request #105598 from bcdarwin/update-perl-text-format
perlPackages.TextFormat: 0.61 -> 0.62
2020-12-01 18:15:33 +01:00
Jörg Thalheim
29528a11da
Merge pull request #97470 from drewrisinger/dr-pr-spdlog-1_8 2020-12-01 17:14:19 +00:00
Sandro
0cc3500c5c
Merge pull request #105589 from r-ryantm/auto-update/1password
_1password-gui: 0.9.5-2 -> 0.9.6
2020-12-01 17:59:29 +01:00
Sandro
28858cb20a
Merge pull request #105588 from r-ryantm/auto-update/abcMIDI
abcmidi: 2020.08.09 -> 2020.11.07
2020-12-01 17:58:52 +01:00
edef
de88771a7d nix-prefetch-docker: output informational messages to stderr
Informational messages belong on stderr, not on stdout and intermixed
with structured output for programmatic use.

Change-Id: I34d094d04460494e9ec8953db7490f4e2292d959
2020-12-01 16:58:29 +00:00