about summary refs log tree commit diff
path: root/pkgs/tools/compression
diff options
context:
space:
mode:
authorEric Seidel <gridaphobe@gmail.com>2015-04-06 18:58:08 -0700
committerEric Seidel <gridaphobe@gmail.com>2015-04-06 18:58:08 -0700
commit6ec373d7763e0d7f392703acb028c74da99fb644 (patch)
tree02e727089b7733158a931f709a8cbb6da3ab35e9 /pkgs/tools/compression
parent04e39bdb5cc52de47c741c555ec301370abfc113 (diff)
parent812d8f9fa62448c4bad7b64b2371c2a61a38e390 (diff)
downloadnixlib-6ec373d7763e0d7f392703acb028c74da99fb644.tar
nixlib-6ec373d7763e0d7f392703acb028c74da99fb644.tar.gz
nixlib-6ec373d7763e0d7f392703acb028c74da99fb644.tar.bz2
nixlib-6ec373d7763e0d7f392703acb028c74da99fb644.tar.lz
nixlib-6ec373d7763e0d7f392703acb028c74da99fb644.tar.xz
nixlib-6ec373d7763e0d7f392703acb028c74da99fb644.tar.zst
nixlib-6ec373d7763e0d7f392703acb028c74da99fb644.zip
Merge branch master into staging
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r--pkgs/tools/compression/lz4/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index c89909503d5d..d7d9fc0c0a2c 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -1,14 +1,12 @@
 { stdenv, fetchurl, valgrind }:
 
 stdenv.mkDerivation rec {
-  # The r127 source still calls itself r126 everywhere, but I'm not going to
-  # patch over such silly cosmetic oversights in an official release. -- nckx
-  version = "127";
+  version = "128";
   name = "lz4-${version}";
 
   src = fetchurl {
     url = "https://github.com/Cyan4973/lz4/archive/r${version}.tar.gz";
-    sha256 = "0hvbbr07j4hfix4dn4xw4fsmkr5s02bj596fn0i15d1i49xby2aj";
+    sha256 = "1lf7a0gqm2q7p1qs28lmajmls3pwfk2p0w3hljjlmshbkndaj26b";
   };
 
   # valgrind is required only by `make test`
@@ -20,6 +18,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   checkTarget = "test";
+  checkFlags = "-j1"; # required since version 128
 
   meta = with stdenv.lib; {
     description = "Extremely fast compression algorithm";