Commit Graph

258070 Commits

Author SHA1 Message Date
Sandro
cdbbe25fc9
Merge pull request #105363 from veprbl/pr/rivet_3_1_3 2020-12-11 08:58:39 +01:00
Sandro
d68e9a7507
Merge pull request #97266 from colemickens/nlohmann_json
nlohmann_json: 3.7.3 -> 3.9.1
2020-12-11 08:55:18 +01:00
Sandro
17345770a7
Merge pull request #101788 from tex/tex/xarchiver
xarchiver: fix running
2020-12-11 08:46:27 +01:00
Jörg Thalheim
a1cacefde5
Merge pull request #106480 from SCOTT-HAMILTON/spdlog 2020-12-11 07:45:06 +00:00
Sandro
4edafadc03
Merge pull request #105784 from phile314/mucmd-jdk11
mucommander: Use jdk11 & gradle6
2020-12-11 08:44:06 +01:00
Merlin Göttlinger
4f9da3341b
inboxer: remove (#105613)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2020-12-11 08:42:14 +01:00
Sandro
73237f997b
Merge pull request #103207 from herrwiese/for-master/chrysalis-init-0.7.9
chrysalis: init at 0.7.9
2020-12-11 08:28:31 +01:00
Sandro
a6947a5761
Merge pull request #102563 from onsails/terraform-ls
terraform-ls: 0.7.0 -> 0.11.0, switch to buildGoModule
2020-12-11 08:19:52 +01:00
Sandro
6fc24a94d8
Merge pull request #104371 from 06kellyjac/octant 2020-12-11 08:13:18 +01:00
Sandro
6704a98ca2
Merge pull request #105741 from aanderse/kodi-python
kodi: accept plugins without extraRuntimeDependencies
2020-12-11 08:12:33 +01:00
Sandro
9b9ac6436b
Merge pull request #106420 from IvarWithoutBones/fix-tldextract
pythonPackages.tldextract: add missing dependency
2020-12-11 08:08:34 +01:00
Sandro
9df5f33e72
Merge pull request #106426 from danieldk/1password-gui-0.9.7
_1password-gui: 0.9.6 -> 0.9.7
2020-12-11 08:03:19 +01:00
Sandro
f1e3b5160e
Merge pull request #103338 from hjones2199/siril 2020-12-11 07:35:23 +01:00
Sarah Brofeldt
db4ca0b58c
Merge pull request #106538 from johanot/kubernetes-1.19.5
kubernetes: 1.19.4 -> 1.19.5
2020-12-11 07:30:34 +01:00
Hunter Jones
69741a7a48 siril: init at 0.99.6 2020-12-11 00:07:30 -06:00
Sandro
3e96635e90
Merge pull request #106361 from SFrijters/maestral-1.3 2020-12-11 07:06:16 +01:00
Sandro
d33fb82b8c
Merge pull request #101947 from edbentley/audiowaveform 2020-12-11 07:03:57 +01:00
Sandro
f097374754
Merge pull request #105938 from virusdave/dnicponski/scratch/add_osx-cpu-temp
osx-cpu-temp: Init at 1.0
2020-12-11 06:56:57 +01:00
Sandro
771b78d88b
Merge pull request #105149 from onsails/tabnine
tabnine: fix binary permissions
2020-12-11 06:56:39 +01:00
con-f-use
5c0b0f33e4
mcomix3: manpage location, app icon (#105450)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2020-12-11 06:47:20 +01:00
Sandro
f01161226a
Merge pull request #105681 from avdv/q-text-as-data-2.0.19
q-text-as-data: 1.7.4 -> 2.0.19
2020-12-11 06:45:31 +01:00
Sandro
362b1a60f8
Merge pull request #106478 from freezeboy/alias-amsn 2020-12-11 06:44:40 +01:00
Sandro
6304650805
Merge pull request #106139 from austinbutler/zile-2.6.0.90
zile: 2.4.14 -> 2.6.0.90
2020-12-11 06:34:54 +01:00
Jörg Thalheim
d22d9227f1
Merge pull request #106601 from Mic92/frab
frab: remove package
2020-12-11 05:27:55 +00:00
Jörg Thalheim
f791bd95f3
Merge pull request #106495 from drewrisinger/dr-pr-remove-qasm2image
pythonPackages.qasm2image: remove
2020-12-11 05:23:55 +00:00
Sandro
2c0f6135aa
Merge pull request #104510 from markus1189/rehex-0.3.1 2020-12-11 05:27:27 +01:00
Sandro
e0b40003cb
Merge pull request #106357 from siraben/mfgtools-1.4.43
nxpmicro-mfgtools: 1.3.191 -> 1.4.43
2020-12-11 04:56:46 +01:00
Mario Rodas
32bf00445b
Merge pull request #106616 from 0x4A6F/master-promscale
promscale: 0.1.2 -> 0.1.3
2020-12-10 22:08:46 -05:00
Mario Rodas
dde8dce285
Merge pull request #106541 from marsam/sqlparse-install-manpage
python38Packages.sqlparse: install manpage
2020-12-10 22:07:55 -05:00
Orivej Desh
2341270330 claws-mail-gtk3: 3.17.5 -> 3.99.0 2020-12-11 02:18:51 +00:00
Mario Rodas
1084629766
Merge pull request #106584 from r-ryantm/auto-update/jackett
jackett: 0.16.2347 -> 0.17.15
2020-12-10 21:14:53 -05:00
Mario Rodas
210726c6e8
Merge pull request #106559 from r-ryantm/auto-update/dnsproxy
dnsproxy: 0.33.2 -> 0.33.3
2020-12-10 21:10:50 -05:00
Mario Rodas
f76695feb3
Merge pull request #106566 from r-ryantm/auto-update/exoscale-cli
exoscale-cli: 1.21.0 -> 1.22.0
2020-12-10 21:10:30 -05:00
Mario Rodas
565bff8b1b
Merge pull request #106562 from r-ryantm/auto-update/dumb-init
dumb-init: 1.2.3 -> 1.2.4
2020-12-10 21:08:20 -05:00
Mario Rodas
a12f4b08c3
Merge pull request #106540 from marsam/update-flexget
flexget: 3.1.71 -> 3.1.91
2020-12-10 21:07:24 -05:00
Mario Rodas
051fd5d84a
Merge pull request #106569 from r-ryantm/auto-update/flow
flow: 0.138.0 -> 0.139.0
2020-12-10 21:06:08 -05:00
Mario Rodas
deada83a84
Merge pull request #106573 from r-ryantm/auto-update/go-chromecast
go-chromecast: 0.2.5 -> 0.2.6
2020-12-10 21:05:30 -05:00
0x4A6F
e8237c8f94
promscale: 0.1.2 -> 0.1.3 2020-12-11 00:24:07 +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