Commit graph

3991 commits

Author SHA1 Message Date
Anders Kaseorg
3cd8ce3bce treewide: Fix unsafe concatenation of $LD_LIBRARY_PATH
Naive concatenation of $LD_LIBRARY_PATH can result in an empty
colon-delimited segment; this tells glibc to load libraries from the
current directory, which is definitely wrong, and may be a security
vulnerability if the current directory is untrusted.  (See #67234, for
example.)  Fix this throughout the tree.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-15 09:47:03 +01:00
Frederik Rietdijk
bc18cc72dd
Merge pull request #77610 from LnL7/darwin-stdenv-python3
darwin-stdenv: bootstrap with python3
2020-01-15 09:24:57 +01:00
Frederik Rietdijk
eba1f79418 pythonPackages.venvShellHook: init
This is a hook that loads a virtualenv from the specified `venvDir`
location. If the virtualenv does not exist, it is created.
2020-01-14 22:36:21 +01:00
Daiderd Jordan
6328518e98
stdenv: bootstrap darwin with python3
- Replaced python override from the final stdenv, instead we
  propagate our bootstrap python to stage4 and override both
  CF and xnu to use it.

- Removed CF argument from python interpreters, this is redundant
  since it's not overidden anymore.

- Inherit CF from stage4, making it the same as the stdenv.
2020-01-13 11:34:36 +01:00
Jörg Thalheim
7aa6616d00
perl: fix configure phase for Aarch32 (#76922)
In "perl: fuse configureFlags" [1] the effects of the preConfigure
phase were merged into configureFlags. After this change values with
spaces do not reach the configure script intact.

The only flag this affects is `ldflags` for Aarch32 and Mips, and perl
builds without it on armv7l-linux so it's probably no longer required
on any platform.

Fixes:

    configuring
    configure flags: -de -Dcc=cc <...> -Dldflags=\"-lm -lrt\"
    ./Configure: eval: line 1677: unexpected EOF while looking for matching `"'
    ./Configure: eval: line 1678: syntax error: unexpected end of file
    Configure: unknown option -lrt"

[1] 3b50d0462a
2020-01-13 10:06:45 +00:00
R. RyanTM
174190dae1
joker: 0.12.9 -> 0.14.0 2020-01-10 19:39:34 -05:00
Alyssa Ross
163618988f
ruby: remove references to CC by default
This makes RbConfig["CC"] return an invalid path, but I hope nothing
is depending on that anyway...
2020-01-09 15:54:59 +00:00
adisbladis
2d6f1ff4dd
python: Add support for installing Python eggs 2020-01-08 13:59:04 +00:00
Michael Raskin
a280d83949
Merge pull request #77181 from r-ryantm/auto-update/picoLisp
picolisp: 19.6 -> 19.12
2020-01-08 10:01:23 +00:00
Joachim Breitner
246ba7bb0d wasmtime: 20191111 -> v0.8.0 2020-01-07 17:36:29 +01:00
R. RyanTM
1edb9dc658 picolisp: 19.6 -> 19.12 2020-01-06 22:25:42 -08:00
R. RyanTM
7e9851475a janet: 1.5.1 -> 1.6.0 2020-01-06 09:50:36 -08:00
Andrew Childs
68317c736e perl: fix configure phase for Aarch32
In "perl: fuse configureFlags" [1] the effects of the preConfigure
phase were merged into configureFlags. After this change values with
spaces do not reach the configure script intact.

The only flag this affects is `ldflags` for Aarch32 and Mips, and perl
builds without it on armv7l-linux so it's probably no longer required
on any platform.

Fixes:

    configuring
    configure flags: -de -Dcc=cc <...> -Dldflags=\"-lm -lrt\"
    ./Configure: eval: line 1677: unexpected EOF while looking for matching `"'
    ./Configure: eval: line 1678: syntax error: unexpected end of file
    Configure: unknown option -lrt"

[1] 3b50d0462a
2020-01-04 09:51:10 +09:00
Stig Palmquist
76bd004a4b micropython: init at 1.12 2020-01-03 10:57:55 +01:00
Frederik Rietdijk
f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
Austin Seipp
091ddf2650
quickjs: 2019-10-27 -> 2019-12-21
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-01-01 19:31:18 -06:00
Maximilian Bosch
5065378316
evcxr: 0.4.5 -> 0.4.6
https://github.com/google/evcxr/releases/tag/v0.4.6
2020-01-01 21:13:45 +01:00
Frederik Rietdijk
555037a667 Merge master into staging-next 2019-12-31 16:35:53 +01:00
John Ericson
cfd013813e
Merge pull request #74090 from obsidiansystems/ghcjs-cross-without-cc
stdenv, haskell: bonafied GHCJS cross compilation without stdenv.cc
2019-12-30 16:40:43 -08:00
Robin Gloster
760e23136a
treewide: *inputs are lists 2019-12-31 01:09:25 +01:00
Robin Gloster
9126911ba5
ruby: installFlags is a list 2019-12-31 00:50:40 +01:00
Robin Gloster
755db0b689
treewide: installTargets is a list 2019-12-31 00:25:26 +01:00
Robin Gloster
313da176d3
treewide: NIX_*_FLAGS -> string 2019-12-31 00:16:46 +01:00
Robin Gloster
f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Robin Gloster
981ae25113
treewide: NIX_*_COMPILE -> string 2019-12-31 00:07:21 +01:00
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