Commit graph

258088 commits

Author SHA1 Message Date
github-actions[bot] 614876ef33
Merge master into staging-next 2020-12-11 00:40:21 +00:00
Carles Pagès f1f9a55fb4 minecraft: 2.2.741 -> 2.2.909 2020-12-11 00:50:26 +01:00
adisbladis a8d8f916f2
Merge pull request #106607 from alyssais/emacs-broken
emacsPackages: mark some packages as broken
2020-12-11 00:29:33 +01:00
adisbladis 316094b8ab
Merge pull request #106606 from alyssais/elpa-meta
emacsPackages.elpaBuild: pass through meta
2020-12-11 00:22:42 +01:00
adisbladis a9fe36cd0b
Merge pull request #106547 from alyssais/siteVersionDir
emacs: fix siteVersionDir path
2020-12-11 00:19:21 +01:00
adisbladis 1ad3b14759
Merge pull request #106608 from alyssais/melpa-homepage
emacsPackages.melpaPackages: HTTPS for homepages
2020-12-11 00:10:01 +01:00
adisbladis 09e349206d
Merge pull request #106486 from alyssais/emacsWithPackages
emacsWithPackages: EMACSLOADPATH correctness fixes
2020-12-11 00:08:59 +01:00
Ryan Mulligan 904b2bde0e
Merge pull request #106583 from r-ryantm/auto-update/istioctl
istioctl: 1.8.0 -> 1.8.1
2020-12-10 15:05:07 -08:00
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
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
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
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
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
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
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 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
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
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
Michael Weiss 4ea2b2129e
chromiumBeta: 88.0.4324.27 -> 88.0.4324.41 2020-12-10 17:43:52 +01: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 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
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
Kamil Chmielewski bc9c9cd6da nim: expose testament test runner
https://nim-lang.org/docs/testament.html
2020-12-10 14:49:01 +01:00
R. RyanTM e0d253916a clojure-lsp: 20201205T230541 -> 20201207T142850 2020-12-10 13:47:40 +00:00
WilliButz daf9fa3518
grafana: 7.3.4 -> 7.3.5
https://github.com/grafana/grafana/releases/tag/v7.3.5
2020-12-10 14:28:54 +01:00
Ben Siraphob a1ea6571c2 rmapi: 0.0.12 -> 0.0.13 2020-12-10 20:10:27 +07:00
Anderson Torres 4c5b28bd8a
Merge pull request #106303 from con-f-use/mpv_umpv_desktop
mpv: umpv desktop file
2020-12-10 10:04:18 -03:00
Jan Tojnar f0a7851ed5
tracker: fix compatibility with sqlite 3.34 2020-12-10 13:37:26 +01:00
github-actions[bot] 9e3f47d2e8
Merge master into staging-next 2020-12-10 12:20:20 +00:00
Alyssa Ross 755670f5e4
emacs: fix siteVersionDir path
siteVersionDir isn't a full path, it's just the name of the version
directory entry in $out/share/emacs, e.g. "27.1", so since
d1b0eef9b5 ("emacs: Don't use interpolation for version"), we've been
trying to remove a non-existent directory.  This would have been
caught if we hadn't been giving -f to rm unnecessarily, because -f
suppresses errors.  As well as fixing the path, I've removed the -f
from rm.  Doing this to the line above as well revealed that rm-ing
$out/var was no longer necessary, since nothing has been put there
since ac23a7c459 ("emacs: 25.3 → 26.1") -- it would now only be
created if we set the --with-gameuser configure option, which we
don't.
2020-12-10 12:19:14 +00:00
Mario Rodas 1f65211aa3
Merge pull request #106537 from r-ryantm/auto-update/argocd
argocd: 1.7.10 -> 1.8.1
2020-12-10 06:30:07 -05:00
Mario Rodas cc9c82074e
Merge pull request #106373 from marsam/drop-terraform_0_11
terraform_0_11: drop
2020-12-10 06:20:44 -05:00
Mario Rodas 5d85bda128
Merge pull request #106286 from Tomahna/bloop
bloop: 1.4.5 -> 1.4.6
2020-12-10 06:16:22 -05:00