Commit Graph

3885 Commits

Author SHA1 Message Date
John Ericson
d0d5136cce Merge remote-tracking branch 'upstream/master' into wrapper-pname-support 2019-11-24 17:25:07 +00:00
John Ericson
9b090ccbca treewide: Get rid of most parseDrvName without breaking compat
That is because this commit should be merged to both master and
release-19.09.
2019-11-24 17:22:28 +00:00
John Ericson
505dcb3b73
Merge pull request #73946 from Ericson2314/fix-lua-env
lua wrapper: Fix bash error
2019-11-23 12:38:44 -05:00
John Ericson
a610a38cb5 lua wrapper: Fix bash error
Recently, we made it harder for external code to use some stdenv-only bash
variables by unsetting them in [1] But Lua's `withPackages` was sourcing some
setup hooks in [2], which required those bash variables.

I say great! We caught something bad: Lua should use normal dependencies, even
though that is harder with `buildEnv`. Now it works that way, and everything is
fine.

[1]: 9d3911f806/pkgs/stdenv/generic/setup.sh (L574-L578)

[2]: 9d3911f806/pkgs/development/interpreters/lua-5/wrapper.nix (L23-L27)

CC @matthewbauer
2019-11-22 19:47:27 -05:00
c0bw3b
0afae5c14b Treewide: fix more URL permanent redirects
Related issue: #60004
Previous PR: #73478
2019-11-21 15:37:34 -08:00
Frederik Rietdijk
1939a97811 python3: add pythonForBuild as parameter, fixes python3Minimal
`pythonForBuild` exists for cross-compilation. When one overrides
python, one needs to ensure pythonForBuild matches.
2019-11-21 22:00:23 +01:00
Frederik Rietdijk
ad3ef645b0 python3Minimal: 3.7.4 -> 3.7.5
Base it on python37 so we ensure the package remains up to date.
2019-11-21 15:34:37 +01:00
Christian Kauhaus
9a1e9258f6 lua-5.3: add patch for CVE-2019-6706
Taken from
http://launchpadlibrarian.net/417853567/lua5.3_5.3.3-1_5.3.3-1ubuntu0.18.10.1.diff.gz
and adapted to our needs.

Re #54799
2019-11-21 11:10:45 +01:00
Frederik Rietdijk
65edeb8633 Merge master into staging-next 2019-11-20 10:01:49 +01:00
Frederik Rietdijk
648152fdbb python39: init at 3.9.0a1
It's a year until the final release but this will give a chance to test
out certain features and how it integrates with other packages.
https://www.python.org/dev/peps/pep-0596/
2019-11-20 09:42:27 +01:00
Jan Tojnar
2a85ee83b2
guile: fix unbound variable in setup-hook
For compat with set -u
2019-11-20 05:12:13 +01:00
Jan Tojnar
ae465621ff
pythonPackages.pipBuildHook: fix unbound variable
for compatibility with set -u
2019-11-20 05:06:51 +01:00
Frederik Rietdijk
f6b39f852e Merge master into staging-next 2019-11-19 10:53:44 +01:00
Daiderd Jordan
f89fff0154
Merge pull request #73457 from cw789/erlang_update
erlangR22: 22.0.4 -> 22.1.7
2019-11-18 23:17:44 +01:00
Timo Kaufmann
d17a25d190
Merge pull request #73448 from cw789/elixir_update
elixir_1_9: 1.9.2 -> 1.9.4
2019-11-18 21:30:10 +01:00
Ivan Kozik
106d4049cd quickjs: init at 2019-10-27 (#73515) 2019-11-17 13:35:29 -08:00
cw
1cb60e4dab erlangR22: 22.0.4 -> 22.1.7 2019-11-15 13:35:55 +01:00
cw
110bf03058 elixir_1_9: 1.9.2 -> 1.9.4 2019-11-15 09:34:59 +01:00
Frederik Rietdijk
c6e31d0767 Merge master into staging-next 2019-11-14 13:31:39 +01:00
Frederik Rietdijk
7e7cec1562 hy: use python2, build fails with 3 2019-11-13 16:27:38 +01:00
Frederik Rietdijk
5004cc90f6 renpy: explicitly use python2 2019-11-13 16:27:37 +01:00
Frederik Rietdijk
73b88e17dd Merge staging-next into staging 2019-11-11 12:09:26 +01:00
adisbladis
d053944e7b
octave: Don't use libGLU_combined 2019-11-09 10:34:49 +00:00
Vladimír Čunát
457e94d900
Merge branch 'master' into staging-next
~4k rebuilds on each Linux.
2019-11-09 07:26:53 +01:00
John Ericson
5132cc822a
Merge pull request #72812 from NixOS/bash-no-undef-vars
cc-wrapper, bintools-wrapper: Remove now unneeded `set {+,-}u`
2019-11-08 15:26:14 -05:00
John Ericson
f7fdc997bf Merge commit 'afa48f16f265fd3e88073bca7929e1e103bd3dc3' into bash-no-undef-vars 2019-11-08 13:58:27 -05:00
John Ericson
aaf0fd2c44 lua-5 setup hook: LUA_PATH and LUA_CPATH can be undefined 2019-11-08 13:24:20 -05:00
Matthew Bauer
5ebd36403e
Merge pull request #70641 from maggesi/rename-z77z-into-maggesi
Rename z77z into maggesi
2019-11-07 17:18:20 -05:00
Matthew Bauer
730b739ec6
Merge pull request #70274 from delroth/lua51-cve-master
lua5_1: rename patch file to match its CVE id
2019-11-07 17:10:21 -05:00
Matthew Bauer
ff12e10d12
Merge pull request #71316 from nomeata/bump-wasmtime
wasmtime: 20190521 -> 20191018
2019-11-07 17:04:26 -05:00
R. RyanTM
01aedf07d9 renpy: 7.3.3 -> 7.3.5 (#72653)
(#72653)
2019-11-06 18:53:53 +01:00
John Ericson
f11ed19450
Merge pull request #65761 from lopsided98/perl-cross-references
perl: fix errant references when cross-compiling
2019-11-05 14:26:36 -05:00
Frederik Rietdijk
c4e30cf98c Merge staging-next into staging 2019-11-05 14:18:08 +01:00
Frederik Rietdijk
03a9822405 Merge master into staging-next 2019-11-05 14:17:37 +01:00
Ben Wolsieffer
49afaab294 perl: fix errant references when cross-compiling 2019-11-05 00:34:34 -05:00
John Ericson
acd2d19484
Merge pull request #72347 from NixOS/bash-no-undef-vars
treewide: `set -u` everywhere
2019-11-04 19:52:33 -05:00
Jonathan Ringer
deb201b311 update-python-libraries: update usage comments 2019-11-03 12:03:27 -08:00
Frederik Rietdijk
9d59d57d45 Merge staging-next into staging 2019-11-03 14:01:28 +01:00
Frederik Rietdijk
7827d3f449 python35: 3.5.8 -> 3.5.9
There were no new changes in version 3.5.9; 3.5.9 was released only because of a CDN caching problem,
which resulted in some users downloading a prerelease version of the 3.5.8 .xz source tarball.
Apart from the version number, 3.5.9 is identical to the proper 3.5.8 release.
2019-11-03 11:21:05 +01:00
Dmitry Kalinkin
3466faf9d8 pythonPackages.setuptoolsBuildHook: fix debug message 2019-11-03 10:34:44 +01:00
Michael Raskin
66523b7bbc
Merge pull request #72576 from r-ryantm/auto-update/love
love_11: 11.2 -> 11.3
2019-11-02 19:47:57 +00:00
R. RyanTM
aabf8498d3 love_11: 11.2 -> 11.3 2019-11-02 05:50:48 -07:00
R. RyanTM
901f445cbe jruby: 9.2.8.0 -> 9.2.9.0 2019-11-01 21:49:48 -07:00
John Ericson
b7f4bda282 treewide: *Phase(s)? variables are optional
If these aren't defined, the stdenv defaults are used in the `*Phase`
case, or no extra phases are done, in the `*Phases` case.
2019-11-01 14:44:44 -04:00
John Ericson
2811b032d6 treewide: Make still dont* Variables are optional in most cases
Go beyond the obvious setup hooks now, with a bit of sed, with a skipped case:

 - cc-wrapper's `dontlink`, because it already is handled.

Also, in nix files escaping was manually added.

EMP
2019-11-01 14:44:44 -04:00
Frederik Rietdijk
ccf514a61d python35: 3.5.7 -> 3.5.8 2019-10-29 10:39:50 +01:00
Aaron Andersen
a480006281 php: 7.2.23 -> 7.2.24, 7.3.10 -> 7.3.11 2019-10-25 03:09:19 -04:00
Frederik Rietdijk
a85e58ac13 Merge master into staging-next 2019-10-23 09:38:37 +02:00
Florian Klink
5c3401b605
Merge pull request #71650 from flokli/racket-7.4
racket: 7.3 -> 7.4
2019-10-22 22:59:20 +02:00
Ryan Mulligan
3133a144d5
Merge pull request #71629 from r-ryantm/auto-update/janet
janet: 1.3.1 -> 1.4.0
2019-10-22 06:24:52 -07:00