3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

3964 commits

Author SHA1 Message Date
Jan Tojnar f4e74edd8c python.pkgs.wrapPython: get rid of warning
When `makeWrapperArgs` variable is not set, `declare -p makeWrapperArgs`
will return with 1 and print an error message to stderr.

I did not handle the non-existence case in b0633406cb
because I thought `mk-python-derivation` will always define `makeWrapperArgs`
but `wrapProgram` can be called independently. And even with `mk-python-derivation`,
`makeWrappers` will not be set unless explicitly declared in the derivation
because of https://github.com/NixOS/nix/issues/1461.

I was lead to believe that because the builds were succeeding and I confirmed
that the mechanism fails when the variable is not defined and `-o nounset` is enabled.
It appears that `wrapPython` setup hook is not running under `-o nounset`, though,
invaldating the assumption.

Now we are checking that the variable exists before checking its type, which
will get rid of the warning and also prevent future error when `-o nounset`
is enabled in the setup hook.

For more information, see the discussion at
https://github.com/NixOS/nixpkgs/commit/a6bb2ede232940a96150da7207a3ecd15eb6328
2019-12-30 16:46:55 +01:00
Alyssa Ross a08e5665fa rubygems: fix for Ruby with no openssl
This fixes the rubyMinimal package.
2019-12-30 16:11:23 +01:00
Robin Gloster 65395a7105
treewide: installTargets is a list 2019-12-30 13:29:27 +01:00
Merijn Broeren 133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Robin Gloster 3b50d0462a
perl: fuse configureFlags 2019-12-30 11:13:36 +01:00
Jan Tojnar a69e309794
Merge branch 'staging-next' into staging 2019-12-30 05:24:03 +01:00
Jan Tojnar 480fc1856a
Merge branch 'master' into staging-next 2019-12-30 05:22:23 +01:00
Robin Gloster ac8eaa8507
treewide: fix *Flags 2019-12-30 04:50:37 +01:00
Frederik Rietdijk 5aed91512d Merge staging-next into staging 2019-12-29 10:20:05 +01:00
Frederik Rietdijk fb66525297 Merge master into staging-next 2019-12-29 10:19:39 +01:00
Jan Tojnar a6bb2ede23
python.pkgs.wrapPython: fix string makeWrapperArgs
Bash takes an assignment of a string to an array variable:

local -a user_args
user_args="(foo bar)"

to mean appending the string to the array, not parsing the string into
an array as is the case when on the same line as the declaration:

local -a user_args="(foo bar)"

b0633406cb extracted the declaration before
the newly branched code block, causing string makeWrapperArgs being added
to the array verbatim.

Since local is function scoped, it does not matter if we move it inside
each of the branches so we fix it this way.
2019-12-28 22:23:36 +01:00
worldofpeace 4a2621da53
Merge pull request #76283 from jtojnar/python-mwa
python.pkgs.wrapPython: fix makeWrapperArgs
2019-12-26 19:21:37 -05:00
Mario Rodas 76200c4284 ruby_2_7: init at 2.7.0
Release notes: https://www.ruby-lang.org/en/news/2019/12/25/ruby-2-7-0-released/
2019-12-25 14:24:03 +00:00
Mario Rodas 298010982b ruby: rubygems 3.0.6 -> 3.1.2
Changelog: https://blog.rubygems.org/2019/12/20/3.1.2-released.html
2019-12-25 14:24:03 +00:00
Profpatsch 7d4c1ae7f1 rubyMinimal: ruby with all options disabled by default
Similar to `gitMinimal` or `pythonMinimal`, this is useful for scripts
which don’t use anything but the standard library and want a small
footprint.
2019-12-25 13:59:42 +01:00
Profpatsch 80c07f8aaf ruby: add removeReferenceToCC package option
Reduces the runtime closure by ~200MB if enabled.
2019-12-25 13:59:42 +01:00
Jan Tojnar 4bbc6cc66f
Merge branch 'staging-next' into staging 2019-12-25 05:18:52 +01:00
Jan Tojnar ca39dd3a8a
Merge branch 'master' into staging-next 2019-12-25 05:15:06 +01:00
Jan Tojnar b0633406cb
python.pkgs.wrapPython: fix makeWrapperArgs
When `makeWrapperArgs` is a Bash array, we only passed the first
item to `wrapProgram`. We need to use `"${makeWrapperArgs[@]}"`
to extract all the items. But that breaks the common string case so
we need to handle that case separately.
2019-12-23 18:02:44 +01:00
worldofpeace 9ce10d7d22 erlang: build on aarch64-linux
I've built several versions without issue.
2019-12-22 21:27:52 -05:00
Markus Kowalewski 7d44826298
php: 7.2.25 -> 7.2.26 2019-12-21 16:49:28 +01:00
Markus Kowalewski 9e4716b1f5
php: 7.4.0 -> 7.4.1 2019-12-21 14:05:13 +01:00
Markus Kowalewski 10060abfc0
php: 7.3.12 -> 7.3.13 2019-12-21 14:04:58 +01:00
Mario Rodas 039a5bd71b
Merge pull request #75947 from eraserhd/staging-tcl-symlink-fix
tcl: fix dangling symlink
2019-12-20 18:39:03 -05:00
Frederik Rietdijk ad733b5505 python37: 3.7.5 -> 3.7.6 2019-12-19 17:37:02 +01:00
Frederik Rietdijk c0c65fe83c python39: 3.9.0a1 -> 3.9.0a2 2019-12-19 17:36:21 +01:00
Frederik Rietdijk 2012dd5734 python38: 3.8.0 -> 3.8.1 2019-12-19 17:36:21 +01:00
Frederik Rietdijk 5796029c5d python36: 3.6.9 -> 3.6.10 2019-12-19 17:36:20 +01:00
Jason Felice 41a48b5895 tcl: fix dangling symlink 2019-12-19 09:46:36 -05:00
Frederik Rietdijk 39037a3431 Merge staging-next into staging 2019-12-19 09:21:24 +01:00
Mario Rodas 56a206efe9
gauche: 0.9.8 -> 0.9.9
Release notes: https://practical-scheme.net/gauche/gmemo/?Release%200.9.9
2019-12-16 20:20:20 -05:00
Andreas Rammhold 8185415b55
Merge pull request #75763 from gilligan/manylinux-interp
python: remove _manylinux.py
2019-12-17 00:01:58 +01:00
Andreas Rammhold e9f522eee1
python: remove _manylinux.py
This will turn manylinux support back on by default.

PIP will now do runtime checks against the compatible glibc version to
determine if the current interpreter is compatible with a given
manylinux specification. However it will not check if any of the
required libraries are present.

The motivation here is that we want to support building python packages
with wheels that require manylinux support. There is no real change for
users of source builds as they are still buildings packages from source.

The real noticeable(?) change is that impure usages (e.g. running `pip
install package`) will install manylinux packages that previously
refused to install.
Previously we did claim that we were not compatible with manylinux and
thus they wouldn't be installed at all.

Now impure users will have basically the same situation as before: If
you require some wheel only package it didn't work before and will not
properly work now. Now the program will fail during runtime vs during
installation time.

I think it is a reasonable trade-off since it allows us to install
manylinux packages with nix expressions and enables tools like
poetry2nix.

This should be a net win for users as it allows wheels, that we
previously couldn't really support, to be used.
2019-12-16 16:37:16 +01:00
Jonathan Ringer 4b1c34cac6 gtk-server: 2.3.1 -> 2.4.5
Also bumped gtk version from gtk2 to gtk3
2019-12-15 13:31:53 -08:00
Jan Tojnar 429561978b
Merge branch 'master' into staging-next 2019-12-14 23:09:06 +01:00
Michael Raskin dd3ddb3e6d
Merge pull request #70772 from tmplt/octave-gl2ps
octave: build with gl2ps
2019-12-13 21:24:23 +00:00
Frederik Rietdijk dfdf1597a7 Merge master into staging-next 2019-12-13 11:43:39 +01:00
Tobias Pflug 418ad571c3 Fix manylinux packages
Make sure lib outputs are used where applicable.
2019-12-13 11:40:44 +01:00
José Luis Lafuente 44fe29a624 clojure: 1.10.1.489 -> 1.10.1.492
Install again default deps.edn. deps.edn was embedded in clojure jar,
but that change was reverted, see
a34969513f

Update derivation to produce only one output. Multiple outputs was
introduced by #35140, but I don't think is necessary anymore.
2019-12-11 13:33:35 +01:00
Frederik Rietdijk f3618342ec Merge staging-next into staging 2019-12-10 19:01:27 +01:00
Elis Hirwing 9d71e7f1fb
php74: Enable zip support
This fixes #75427
2019-12-10 17:49:19 +01:00
R. RyanTM ce8de3bc05 duktape: 2.4.0 -> 2.5.0 2019-12-08 21:47:09 +01:00
Michael Raskin 06346a12a0
Merge branch 'master' into octave-gl2ps 2019-12-08 18:09:08 +00:00
Izorkin 1b903aa70e php73: 7.3.11 -> 7.3.12 2019-12-07 12:28:19 +03:00
Izorkin c56f044aa4 php72: 7.2.24 -> 7.2.25 2019-12-07 12:28:19 +03:00
Mario Rodas f00e169aed
Merge pull request #74968 from marsam/update-racket
racket: 7.4 -> 7.5
2019-12-05 05:46:25 -05:00
Frederik Rietdijk 6530535b20
manylinux packages for Python
This adds three lists with manylinux dependencies as well as three
packages that include all the manylinux dependencies.
2019-12-05 09:56:20 +00:00
Frederik Rietdijk 353ec3f3a8
Merge pull request #73491 from Izorkin/unit
unit: 1.12.0 -> 1.13.0
2019-12-05 10:25:54 +01:00
Frederik Rietdijk 51ef7c3e49 Merge master into staging-next 2019-12-05 09:14:08 +01:00
Aaron Andersen 4b995ddfe7
Merge pull request #73883 from etu/init-php74
php74: init at 7.4.0
2019-12-04 18:18:32 -05:00