Commit Graph
131564 Commits
Author SHA1 Message Date
John Ericson 79816cd64b Merge branch 'fix-splice' into ericson2314-cross-base 2017-12-10 15:16:42 -05:00
Orivej Desh c86b19cb20 Python: simplify hasPythonModule 2017-12-10 20:10:35 +00:00
Bjørn Forsman 72e635a4cd lighttpd: 1.4.45 -> 1.4.48 2017-12-10 21:05:24 +01:00
Andreas Rammhold 4314648fa1 graphicsmagick: 1.3.26 -> 1.3.27 (fixes CVE-2017-11102 amongst others)
See [1] for details.

[1] https://sourceforge.net/p/graphicsmagick/mailman/message/36152268/
2017-12-10 20:56:23 +01:00
Frederik Rietdijk 9630bd5232 python.pkgs.setuptools: mark as python module 2017-12-10 20:40:35 +01:00
Frederik Rietdijk a334930490 Python: rewrite requiredPythonModules. Add requiredPythonModules attribute to derivation 2017-12-10 20:40:34 +01:00
Orivej Desh bf132e6464 gnuplot_qt: Qt 4 -> Qt 5 2017-12-10 19:30:57 +00:00
Orivej Desh 051cbf7cbe gnuplot: build with libcerf 2017-12-10 19:30:57 +00:00
Orivej Desh e21e752caf libcerf: init at 1.5
squash! libcerf: init at 1.5

squash! libcerf: init at 1.5
2017-12-10 19:30:57 +00:00
Tim Steinbach 0781951e75 docker: 17.09.0 -> 17.09.1 2017-12-10 14:16:27 -05:00
Tim Steinbach 4ff0429662 sbt-extras: Add JDK dependency
The derivation would use `java` from the PATH. This fixed the behaviour.
2017-12-10 13:48:23 -05:00
John Ericson b0114725f3 Merge pull request #32521 from obsidiansystems/fix-splice
top-level: Fix splicing in the presence of evaluation errors
2017-12-10 13:34:24 -05:00
Tim Steinbach 3bb52f9259 linux: 4.14.4 -> 4.14.5 2017-12-10 13:13:48 -05:00
Tim Steinbach bd6424010d linux: 4.9.67 -> 4.9.68 2017-12-10 13:10:45 -05:00
Peter Simons c4b8df308f Merge pull request #32423 from NickHu/pandoc2
pandoc2: fix Haskell dependencies
2017-12-10 17:45:32 +01:00
Moritz Ulrich d3fbf9b821 notmuch: Add myself to maintainers 2017-12-10 17:18:32 +01:00
Markus Hauck 614a6d43a7 scalafmt: 0.6.8 -> 1.3.0 2017-12-10 17:02:40 +01:00
Michael Fellinger 3abcc2c514 Revert "calamares: remove due to being broken and insecure."
This reverts commit c677c35922.
2017-12-10 16:59:33 +01:00
Orivej Desh dd604d575f Merge branch 'master' into staging
* master: (39 commits)
  pythonPackages: rename dns -> dnspython
  awesome: fix LUA_PATH/LUA_CPATH to lgi [now for version 3.5]
  qt4: fix qmake on darwin and delete custom install phase
  python.buildEnv: always include the $out output
  nix-bash-completions: lazy load aware install
  borg: 1.1.1 -> 1.1.3
  nixos/programs/bash: document that /etc/bash_completion.d is obsolete
  ocamlPackages.markup: 0.7.4 -> 0.7.5
  hhvm: 3.21 -> 3.23.2
  ocamlPackages.ulex: 1.1 -> 1.2
  notmuch: 0.25.2 -> 0.25.3
  gmime3: 3.0.1 -> 3.0.5
  qt4: fix darwin install phase
  nixos/programs/bash: Let bash-completion lazy load scripts
  Revert "gmime: 3.0.1 -> 3.0.5"
  rawtherapee: delete unused files
  pythonPackages: rename dns -> dnspython
  nixpkgs: remove sqlite/kyotocabinet deps for leveldb
  tor-browser-bundle-bin: 7.0.10 -> 7.0.11
  networkmanager: remove restart after suspend from resume
  ...
2017-12-10 15:24:30 +00:00
Frederik Rietdijk d945b3e53b buildPythonPackage: remove bytecode from bin folder
When a Python script has the extension `.py`, bytecode is generated.
Typically, executables in bin have no extension, so no bytecode is
generated. However, some packages do provide executables with
extensions, and thus bytecode is generated.
2017-12-10 16:01:09 +01:00
Frederik Rietdijk b459c8475c Merge pull request #32541 from rnhmjoj/dnspython
pythonPackages: rename dns -> dnspython (round 2)
2017-12-10 15:44:25 +01:00
rnhmjoj 491bc4cfed pythonPackages: rename dns -> dnspython 2017-12-10 15:27:06 +01:00
Orivej Desh 8168671385 Merge pull request #32534 from hedning/bashstartup
nixos/programs/bash: Let bash-completion lazy load scripts
2017-12-10 14:25:38 +00:00
Aristid Breitkreuz 5f4e80a86f awesome: fix LUA_PATH/LUA_CPATH to lgi [now for version 3.5] 2017-12-10 15:23:55 +01:00
Orivej Desh f601ecfb21 qt4: fix qmake on darwin and delete custom install phase
Since keeping `installPhase = ""` to signify "use the default installPhase" will
be surprising, this deletes the installPhase and rebuilds qt4 on all platforms.

Fixes #30238
2017-12-10 14:22:02 +00:00
Frederik Rietdijk 163ba09117 python.buildEnv: always include the $out output
28299f669a introduced the first Python
packages having multiple outputs. The required outputs were not picked
up by `python.buildEnv` (#31857).

This commit modifies `python.buildEnv` so that it always includes the
$out output and thus fixes #31857.
2017-12-10 15:21:35 +01:00
Orivej Desh 5fdffa084f Merge pull request #32539 from hedning/nix-bash-completion-symlink
nix-bash-completions: lazy load aware install
2017-12-10 14:18:06 +00:00
Tor Hedin Brønner f79d69113e nix-bash-completions: lazy load aware install
`bash-completion` lazy loads completion scripts by looking up the command name
in the completion directory. As such we need to create a symlink for every
nix command.

The problem had been masked by nixos sourcing all completion scripts on startup.
2017-12-10 14:07:13 +00:00
Aristid Breitkreuz c4a5ab728b borg: 1.1.1 -> 1.1.3 2017-12-10 14:26:03 +01:00
Orivej Desh 42973bef3f nixos/programs/bash: document that /etc/bash_completion.d is obsolete
https://github.com/scop/bash-completion/blob/fbd52a5e31747beb4974da97b9d3ed4f6ceb7a61/bash_completion#L2070-L2078
2017-12-10 12:16:25 +00:00
Vincent Laporte 746d9d1b7b ocamlPackages.markup: 0.7.4 -> 0.7.5 2017-12-10 13:01:40 +01:00
Orivej Desh 166536e152 Merge pull request #32535 from Gerschtli/update/hhvm
hhvm: 3.21 -> 3.23.2
2017-12-10 11:50:41 +00:00
Tobias Happ d5d7220770 hhvm: 3.21 -> 3.23.2 2017-12-10 11:50:15 +00:00
Vincent Laporte 1ccd3b9755 ott: 0.25 -> 0.27 2017-12-10 11:49:05 +00:00
Vincent Laporte d98d944d5d Merge pull request #32494 from mpickering/ber-metaocaml2
ber_metaocaml: (re)init at 104
2017-12-10 12:36:30 +01:00
Vincent Laporte b1659c89c1 ocamlPackages.ulex: 1.1 -> 1.2 2017-12-10 12:24:10 +01:00
Moritz Ulrich 8974a9bf9a notmuch: 0.25.2 -> 0.25.3 2017-12-10 12:15:50 +01:00
Moritz Ulrich 7df7739888 gmime3: 3.0.1 -> 3.0.5 2017-12-10 12:15:50 +01:00
Andreas Rammhold 92158e871e uwsgi: do not touch unix.h anymore 2017-12-10 12:12:47 +01:00
Andreas Rammhold 1217ffea87 prayer: use correct include directory for c-client aka uwimap 2017-12-10 12:12:46 +01:00
Andreas Rammhold 939e71fa40 uwimap: Do not pollute include/ with headers
uwimap was shipping an `include/unix.h` file that would be falsely
detected by many applications (e.g. php and its modules). Due to that
file we got hacks like 8c125c0c74.

This also adds some previously missing files that would normally be
installed by uwimap (linkage.c, osdep/unix/*.h, …)
2017-12-10 12:12:45 +01:00
Andreas Rammhold 7d7d3775e5 Revert "fix phpPackages memcache,memcached,xdebug"
This reverts commit 8c125c0c74.
2017-12-10 12:12:43 +01:00
Orivej Desh 5b53774f89 qt4: fix darwin install phase
by creating $out before copying lib to $out
2017-12-10 10:22:08 +00:00
Vladimír Čunát aa9fbd036f openexr: upstream security patch
/cc #32459.
2017-12-10 11:03:30 +01:00
Tor Hedin Brønner 9988224c2a nixos/programs/bash: Let bash-completion lazy load scripts
As described in detail here: https://github.com/NixOS/nixpkgs/issues/32533
bash will load completion scripts in $p/share/bash-completion/completions/ on
startup instead of letting bash-completion do it's lazy loading. Bash startup
will then slow down (very noticeable when bash-completion is installed in a
profile).

This commit leaves loading of scripts in the hands of bash-completion,
improving startup time for everyone using `enableCompletion`.

fixes #32533
2017-12-10 10:15:41 +01:00
Frederik Rietdijk c6fbf4a15a Merge pull request #32531 from rnhmjoj/dnspython
pythonPackages: rename dns -> dnspython
2017-12-10 10:09:05 +01:00
Orivej Desh b6bf8db29f Revert "gmime: 3.0.1 -> 3.0.5"
It breaks notmuch 0.25.2 tests, and updating notmuch to 0.25.3 does not fix them.
2017-12-10 09:07:04 +00:00
Orivej Desh fc930e055a rawtherapee: delete unused files 2017-12-10 08:44:04 +00:00
Jörg Thalheim 8bdbb21f9c Merge pull request #31182 from yegortimoshenko/chroot-user/c-rewrite
chroot-user: rewrite in C, drop CHROOTENV_EXTRA_BINDS
2017-12-10 08:20:59 +00:00
Gabriel Ebner 3dc1274232 firefox: enable webrender 2017-12-10 07:38:16 +01:00