Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv

Conflicts: pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
parent c34932ef86 a2c7804903
commit 811de3bfaa
1015 changed files with 20126 additions and 5810 deletions
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "xz-5.0.5";
+  name = "xz-5.0.7";

  src = fetchurl {
    url = "http://tukaani.org/xz/${name}.tar.bz2";
-    sha256 = "1404i59bp6rzxya0br1q9njdv32z4sggyfrkjr7vq695hk94hv0n";
+    sha256 = "05nnxl19a49h15lxzpn3fd76izrycnr7qaf9qvd408yz973iv1g8";
  };

  doCheck = true;