Commit graph

111379 commits

Author SHA1 Message Date
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
Thomas Tuegel c1c314c36f
openssh: unset LD
Commit 093cc00cdd, sets the LD environment
variable by default, but this confuses the openssh Makefile because `configure'
does not respect it.
2017-07-21 15:44:33 -05:00
Thomas Tuegel 7d010ab5f4
mdadm: unset STRIP
Commit 093cc00cdd, sets the STRIP environment
variable by default, but this confuses the mdadm Makefile, which uses STRIP as a
flag to `install'.
2017-07-21 15:43:25 -05:00
Joel Thompson 9dc51dc00d exhibitor: Fix bugs in previous package
The previous package didn't build properly due to a bug in the build
script, and the nixos module didn't evaluate due to missing descriptions
in the options. This fixes both issues.

It also adds missing command-line options that weren't able to be set
and properly converts bools to the strings exhibitor expects.
2017-07-21 16:14:04 -04:00
Daiderd Jordan 1ef6fc96c8 Merge pull request #27551 from sigma/pr/fzf-0.16.10
fzf: 0.16.9 -> 0.16.10
2017-07-21 21:11:29 +02:00
Yann Hodique 7759b8c1ca fzf: 0.16.9 -> 0.16.10 2017-07-21 11:51:28 -07:00
k0ral 596e279979 network-manager-l2tp: fix configure step (#27541)
* network-manager-l2tp: don't run ./configure twice

* network-manager-l2tp: remove automake/autoconf
2017-07-21 17:18:54 +01:00
Tim Steinbach 92438d5ca9 Merge pull request #27547 from lsix/update_nano
nano: 2.8.5 -> 2.8.6
2017-07-21 12:04:15 -04:00
Lancelot SIX 60091342d4
nano: 2.8.5 -> 2.8.6
See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00007.html
for release announcement
2017-07-21 17:02:31 +02:00
Franz Pletz 1697684591
docker module: fix autoPrune.enable description
cc #27503
2017-07-21 16:54:40 +02:00
Daniel Peebles 1698bda6b3 Merge pull request #27508 from joelthompson/exhibitor
exhibitor: init at 3.4.9
2017-07-21 10:49:20 -04:00