Commit graph

111389 commits

Author SHA1 Message Date
John Ericson
ea7d13cf1a stdenv-setup and misc hooks: Work with bash-3.4 for MacOS nix-shell
This is a temporary measure until this impurity is removed from Nix.
2017-07-26 09:08:01 -04:00
John Ericson
f6f40e3fe5 stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
2017-07-26 09:07:55 -04:00
John Ericson
34c0ba498c stdenv-setup: Add quotes that don't do anything for consistency.
@vcunat and others rightly point out that it's easier to quote always,
than learn Bash's idiosyncrasies enough to know when it doesn't make a
difference.

This reverts commit 2743078f66, which
removes quotes that don't do anything, and then goes further adding
even more quotes.
2017-07-25 14:36:00 -04:00
John Ericson
98cff3f446 darwin stdenv: Ensure libSystem reexports the right libraries
The logic was made pure for the normal libSystem, but this change never
made it to the bootstrap tools. Deduplication the logic as the comment
suggests would have prevented this, but here's a stop-gap until we do
so.
2017-07-25 14:35:43 -04:00
Eelco Dolstra
47821f1cf0
cc-wrapper: More quadratic performance fixes
This eliminates the slow lookup of whether we've already seen an rpath
/ library path entry.

Issue #27609.
2017-07-25 18:46:49 +02:00
Eelco Dolstra
aa4a92d2df
cc-wrapper/ld-wrapper: Minor speedup in string concatenation
There is still a O(n) pattern match in ld-wrapper, so we should
probably rewrite that code to use associative arrays.
2017-07-24 14:48:26 +02:00
Eelco Dolstra
6669a3b477
stdenv: Remove log nesting
Nix/Hydra no longer support pretty printing of logs, so this is no
longer useful.
2017-07-24 14:30:46 +02:00
Eelco Dolstra
9f345ce2c7
gnumake41: Remove unused version 2017-07-24 14:27:12 +02:00
Eelco Dolstra
8cfe77444b
gnumake40: Remove unused version 2017-07-24 14:27:11 +02:00
Eelco Dolstra
969d7b0451
gnumake380: Remove
This hasn't been used in a long time.
2017-07-24 14:27:11 +02:00
Frederik Rietdijk
29f91c107f Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-23 11:23:43 +02:00
Jörg Thalheim
239b694579 Merge pull request #27575 from danielfullmer/rclone-1.37
rclone: 1.36 -> 1.37
2017-07-23 10:21:03 +01:00
Jörg Thalheim
fb65f9cbc5 Merge pull request #27579 from jfrankenau/update-mpv
mpv: 0.25.0 -> 0.26.0
2017-07-23 10:15:06 +01:00
Johannes Frankenau
7e62e8d036 mpv: 0.25.0 -> 0.26.0
Add option for archive support and fix dvdread and dvdnav support.
2017-07-23 11:00:00 +02:00
Frederik Rietdijk
5328102325 Merge pull request #27572 from winniequinn/vscode-1.14.2
vscode: 1.14.0 -> 1.14.2
2017-07-23 10:43:18 +02:00
Frederik Rietdijk
e028e34606 Merge pull request #27561 from holidaycheck/sauceconnect-4.4.8
sauce-connect: 4.4.7 -> 4.4.8
2017-07-23 10:41:52 +02:00
Thomas Tuegel
9af77826a9 Merge pull request #27522 from ttuegel/bugfix/staging/stdenv
Fixes for various bugs introduced by stdenv update in staging
2017-07-22 21:20:07 -05:00
Daniel Fullmer
6841f7b07d rclone: 1.36 -> 1.37 2017-07-22 21:29:21 -04:00
Thomas Tuegel
101e0998e1
argyllcms: unset AR
Commit 093cc00cdd sets the AR environment variable
by default, but this causes the argyllcms Makefile to use the wrong command.
2017-07-22 19:54:57 -05:00
Thomas Tuegel
4f88ceff49
jam: unset AR
Commit 093cc00cdd sets the AR environment variable
by default, but this causes the jam Makefile to use the wrong command.
2017-07-22 19:36:55 -05:00
Tim Steinbach
869bb2e486
linux-copperhead: 4.12.2.a -> 4.12.3.a 2017-07-22 19:08:02 -04:00
Thomas Tuegel
4b14212914
nixos/tests/keymap: use SLIM theme from nixos/tests/slim 2017-07-22 17:43:28 -05:00
Winnie Quinn
6df05b401b vscode: 1.14.0 -> 1.14.2 2017-07-22 17:35:49 -04:00
Domen Kožar
90fa9eafaf Merge pull request #27557 from adisbladis/substanced_removal
pythonPackages.substanced: Delete severly outdated package
2017-07-22 20:37:02 +02:00
Frederik Rietdijk
138eba0bff Pull request template: clarify the purpose of the template 2017-07-22 18:05:16 +02:00
Graham Christensen
2fb3cc1e6d Merge pull request #27548 from roberth/lvm-update
lvm2: 2.02.140 -> 2.02.173
2017-07-22 09:16:59 -04:00
Graham Christensen
8e945575ae Merge pull request #27558 from adisbladis/cares-CVE-2017-1000381
C-ares: Fix for CVE-2017-1000381
2017-07-22 08:54:14 -04:00
Mathias Schreck
6589a83a88 sauce-connect: 4.4.7 -> 4.4.8 2017-07-22 12:41:47 +02:00
Joachim F
dc841b7bdb Merge pull request #27559 from ericsagnes/pkg/blackbox
blackbox: init at 1.20170611
2017-07-22 10:50:42 +01:00
Eric Sagnes
a6bcc158cf blackbox: init at 1.20170611 2017-07-22 18:15:45 +09:00
Jörg Thalheim
9f4750d930 Merge pull request #27480 from antonxy/houdini
houdini: change sha256, add missing libs, fix license dir patch, fix …
2017-07-22 10:06:48 +01:00
Jörg Thalheim
b1bff52a5c Merge pull request #27469 from Ma27/oh-my-zsh/make-pkg-configurable
programs.zsh.ohMyZsh: add `package` option to make package overrides on module-base easier
2017-07-22 10:00:35 +01:00
adisbladis
66976bc670
c-ares: 1.12.0 -> 1.13.0 for CVE-2017-1000381 2017-07-22 11:52:00 +08:00
adisbladis
d3be3606df
pythonPackages.substanced: Delete severly outdated package 2017-07-22 10:48:07 +08:00
Thomas Tuegel
6a004bf9c8
Merge branch 'master' into bugfix/staging/stdenv 2017-07-21 20:36:34 -05:00
Bjørn Forsman
8537cf0f81 CONTRIBUTING.md: suggest "nixos/<module>" prefix for NixOS changes
Suggest prefixing commit messages that touches NixOS code with
"nixos/<module>" instead of the current "<name> service" prefix.

"<name> service" is limiting in that NixOS code is more than the
services. It is also easier to spot NixOS changes with explicit
"nixos/..." prefix.
2017-07-22 00:21:05 +02:00
Thomas Tuegel
bec5797290
syslinux: fix invalid use of substituteInPlace
substituteInPlace was invoked with multiple targets on the command line, which
is not supported.
2017-07-21 16:51:53 -05:00
Thomas Tuegel
9aa4f09008
qt4: unset LD
Commit 093cc00cdd sets the `LD' environment
variable by default, interfering with the Makefile which uses gcc for linking.
2017-07-21 16:49:32 -05:00
Thomas Tuegel
fe800447c2
qemu: unset CPP
Commit 093cc00cdd sets the environment variable
`CPP' by default, but this interferes with dependency calculation.
2017-07-21 16:49:24 -05:00
Thomas Tuegel
5265d551a9
grub2: unset CPP
Commit 093cc00cdd sets the environment variable
`CPP' by default, but this intereferes with dependency calculation.
2017-07-21 16:49:17 -05:00
Stefan Siegl
75290adaa9
owncloud-client: 2.3.1 -> 2.3.2 2017-07-21 23:19:45 +02:00
Daniel Peebles
ac56eba704 Merge pull request #27552 from joelthompson/exhibitor
exhibitor: Fix bugs in previous package
2017-07-21 17:05:38 -04:00
Thomas Tuegel
b21defaf51
zfs: fix invalid use of substituteInPlace
substituteInPlace was invoked with multiple targets on the command line, which
is not supported.
2017-07-21 15:47:37 -05:00
Thomas Tuegel
20321f66d7
x264: unset AS
Commit 093cc00cdd sets the environment variable
`AS' to the binutils assembler, but x264 needs yasm.
2017-07-21 15:47:12 -05:00
Thomas Tuegel
631f6b3e11
systemd: unset RANLIB
Commit 093cc00cdd sets the RANLIB environment
variable by default, causing `make' to invoke the wrong program.
2017-07-21 15:46:40 -05:00
Thomas Tuegel
15776462b2
libunistring: disable parallel building
Parallel building causes a test deadlock and has been disabled.
2017-07-21 15:46:38 -05:00
Thomas Tuegel
aa11af8bbe
systemd: fix broken source hash 2017-07-21 15:46:33 -05:00
Thomas Tuegel
4a0a066f67
newt: unset CPP
Commit 093cc00cdd sets the CPP environment
variable by default, confusing the newt Makefile, which expects CPP=gcc for
computing dependencies.
2017-07-21 15:45:32 -05:00
Thomas Tuegel
c25199f697
fetchurl: remove unpaired call to `stopNest'
Fixes #27406.

Commit 5d4efb2c81 added an assertion to `stopNest'
which requires it be correctly paired with `startNest'. `fetchurl' calls
`stopNest', but never calls `startNest'; the former calls are removed.
2017-07-21 15:45:29 -05:00
Thomas Tuegel
baad413416
ppp: fix invalid use of substituteInPlace
substituteInPlace was invoked with multiple targets on the command line, which
is not supported.
2017-07-21 15:45:24 -05:00