Merge remote-tracking branch 'origin/staging'

Conflicts: pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
parent ff85b53c5f a71744392b
commit 585983bc95
61 changed files with 3314 additions and 527 deletions
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -10,6 +10,9 @@ stdenv.mkDerivation rec {

  doCheck = true;

+  # In stdenv-linux, prevent a dependency on bootstrap-tools.
+  preHook = "unset CONFIG_SHELL";
+
  meta = {
    homepage = http://tukaani.org/xz/;
    description = "XZ, general-purpose data compression software, successor of LZMA";