about summary refs log tree commit diff
path: root/pkgs/tools/compression
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-09 10:57:57 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-09 10:57:57 +0200
commit811de3bfaabc39a7a7d22ba34053cfb1a2c4e219 (patch)
tree631d4305b76e948baefb54741fe2ea3c4dd9fe8b /pkgs/tools/compression
parentc34932ef86628b8b30284882d8baaef4c56320dd (diff)
parenta2c7804903cdd41d1905fa954bd2dba5e165e793 (diff)
downloadnixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar
nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.gz
nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.bz2
nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.lz
nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.xz
nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.zst
nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.zip
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r--pkgs/tools/compression/xz/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 8bec1b61e303..70c3f260e3c8 100644
--- 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;