Commit Graph

258312 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
Carles Pagès
219301713a
Merge pull request #106065 from bjpbakker/minecraft-fix-java_home
minecraft: fix JAVA_HOME
2020-12-10 23:51:34 +01: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
Alyssa Ross
00a246c5ce
emacsPackages.melpaPackages: HTTPS for homepages 2020-12-10 22:15:21 +00:00
Alyssa Ross
5016fdb269
emacsPackages.elpaBuild: pass through meta
Previously, meta wasn't being passed through at all, because it's
removed from args without being used anywhere.  This made it so that
rcirc-menu wasn't being marked as broken even though it was supposed
to be.

This patch copies the meta handling from melpaBuild, including the
default home page (adapted for ELPA).
2020-12-10 22:03:20 +00:00
R. RyanTM
e8c2cf4ea2 node-problem-detector: 0.8.4 -> 0.8.5 2020-12-10 21:42:01 +00:00
Mario Rodas
a0aba95515
beanstalkd: install manpage (#106544) 2020-12-10 21:35:29 +00:00
Evan Stoll
095ecf7356
vncdo: 0.11.2 -> 0.12.0 (#106380)
* Use pythonPackages instead of python2Packages

* Add vncdo to top-level/python-packages so the library can be used by
other Python programs
* Use toPythonApplication for vnc in top-level/all-packages
* run tests if using Python 3+
* move expression to development/python-modules
2020-12-10 21:27:43 +00:00
Jörg Thalheim
6fa3728805
frab: remove package
broken since 2018
2020-12-10 22:24:11 +01:00
Alyssa Ross
609843b478
emacsPackages.sql-presto: mark broken 2020-12-10 21:22:04 +00:00
Alyssa Ross
322ee87a10
emacsPackages.per-buffer-theme: mark broken 2020-12-10 21:22:03 +00:00
Alyssa Ross
75bd468468
emacsPackages.instapaper: mark broken 2020-12-10 21:22:01 +00:00
Alyssa Ross
183364f96f
emacsPackages.melancholy-theme: mark broken 2020-12-10 21:21:59 +00:00
R. RyanTM
7b52a0b946 musikcube: 0.96.1 -> 0.96.2 2020-12-10 21:21:16 +00:00
Alyssa Ross
4300a94d2f
emacsPackages.magit-stgit: mark broken 2020-12-10 21:21:05 +00:00
Jörg Thalheim
f8e50c3058
Merge pull request #106564 from Mic92/bomi
bomi: remove
2020-12-10 21:00:41 +00:00
Scott Worley
86f0dc221f nixos/locate: Exclude fuse.sshfs
The "fuse" and "sshfs" entries already present are not keeping this find
invocation out of sshfs mounts, which present as fstype "fuse.sshfs"
2020-12-10 12:59:13 -08:00
Scott Worley
e0e08a186d nixos/locate: Add a test 2020-12-10 12:59:13 -08:00
Maximilian Bosch
07aff199ad
Merge pull request #106080 from Ma27/nginx-config-doc
nixos/nginx: improve documentation for `config`
2020-12-10 21:54:01 +01:00
Martin Weinelt
c76f365c0d
python3Packaegs.hass-nabucasa: relax attrs dependency
ERROR: Could not find a version that satisfies the requirement attrs<20.3,>=19.3 (from hass-nabucasa)
2020-12-10 21:44:52 +01:00
R. RyanTM
eb85197962 monero-gui: 0.17.1.5 -> 0.17.1.6 2020-12-10 20:38:13 +00:00
Guillaume Girol
4eb94d0ca1
Merge pull request #94960 from symphorien/gitignore
nix-gitignore: filter-out .git
2020-12-10 20:34:54 +00:00
Ryan Mulligan
248f0bfe6d
Merge pull request #106560 from r-ryantm/auto-update/draco
draco: 1.4.0 -> 1.4.1
2020-12-10 12:22:02 -08:00
R. RyanTM
e2b1c55497 matcha-gtk-theme: 2020-11-23 -> 2020-12-07 2020-12-10 19:57:18 +00:00
WilliButz
df8ee3669f
Merge pull request #106067 from urbas/prometheus-exporter-py-air-control
nixos/prometheus-exporters/py-air-control: init
2020-12-10 20:51:56 +01:00
Matej Urbas
4948743705 nixos/prometheus-exporters/py-air-control: init 2020-12-10 19:02:30 +00:00
R. RyanTM
81125225d6 jackett: 0.16.2347 -> 0.17.15 2020-12-10 18:28:34 +00:00
R. RyanTM
9dd8d11c31 istioctl: 1.8.0 -> 1.8.1 2020-12-10 18:18:56 +00:00
github-actions[bot]
79e586aa98
Merge master into staging-next 2020-12-10 18:15:33 +00:00
R. RyanTM
547cd0e010 ipfs-migrator: 1.6.4 -> 1.7.0 2020-12-10 18:08:09 +00:00
Marc 'risson' Schmitt
27dacb8b4b
nixos/postfix: fix masterCf type
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
2020-12-10 18:49:05 +01:00
Andrey Kuznetsov
e02a8cf473
github-commenter: 0.5.0 -> 0.8.0
migrate to buildGoModule, set platforms to unix
2020-12-10 21:39:01 +04:00
OmnipotentEntity
656888e1ec
geant4: 10.6.3 -> 10.7.0 (#105920) 2020-12-10 12:33:29 -05:00
Maximilian Bosch
21be5b00da
Merge pull request #106473 from Ma27/improve-nextcloud-error
nixos/nextcloud: improve error message for invalid `dbpassFile`
2020-12-10 18:28:50 +01:00
Maximilian Bosch
1446a18718
Merge pull request #106554 from WilliButz/update/grafana/v7.3.5
grafana: 7.3.4 -> 7.3.5
2020-12-10 18:27:41 +01:00
R. RyanTM
7c601e15e5 gqrx: 2.14.2 -> 2.14.3 2020-12-10 17:14:46 +00:00
Maximilian Bosch
f23f63a7b8
Merge pull request #106488 from Luflosi/update/youtube-dl
youtube-dl: 2020.12.07 -> 2020.12.09
2020-12-10 17:57:22 +01:00
R. RyanTM
8e3c875879 go-chromecast: 0.2.5 -> 0.2.6 2020-12-10 16:56:04 +00:00
Michael Weiss
4ea2b2129e
chromiumBeta: 88.0.4324.27 -> 88.0.4324.41 2020-12-10 17:43:52 +01:00
R. RyanTM
7edacf2b2f flow: 0.138.0 -> 0.139.0 2020-12-10 16:08:17 +00:00
SCOTT-HAMILTON
d98fae8072
Update pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
Co-authored-by: Drew <drewrisinger@users.noreply.github.com>
2020-12-10 16:35:46 +01:00
R. RyanTM
4cbd8d1e0c exoscale-cli: 1.21.0 -> 1.22.0 2020-12-10 15:32:54 +00:00
Jörg Thalheim
3897fd61ea
bomi: remove 2020-12-10 16:25:23 +01:00
Jörg Thalheim
d25e1ac426
Merge pull request #106534 from orivej/zfs-rt 2020-12-10 15:10:30 +00:00
R. RyanTM
4cddb0930d dumb-init: 1.2.3 -> 1.2.4 2020-12-10 15:01:17 +00:00
R. RyanTM
a7e8c7c8be draco: 1.4.0 -> 1.4.1 2020-12-10 14:48:24 +00:00
Ryan Mulligan
0f41c841e8
Merge pull request #106555 from r-ryantm/auto-update/clojure-lsp
clojure-lsp: 20201205T230541 -> 20201207T142850
2020-12-10 06:42:48 -08:00
Nick Hu
0ed76c77ac
Merge pull request #106552 from siraben/rmapi-update
rmapi: 0.0.12 -> 0.0.13
2020-12-10 14:42:23 +00:00
R. RyanTM
b197e04c78 dnsproxy: 0.33.2 -> 0.33.3 2020-12-10 14:39:03 +00:00
Pavol Rusnak
1183f62e9f
Merge pull request #106459 from prusnak/electrum
electrum: 4.0.6 -> 4.0.7
2020-12-10 14:59:08 +01:00