diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-24 02:58:00 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-24 02:58:00 -0400 |
| commit | 205fc55ea29a843f28b8fc1932cf1b88fce6bc1d (patch) | |
| tree | 60356fe690d2af5f1d761f5464bee5485db2a9d7 /pkgs/tools/compression | |
| parent | 46eeef1898ffbf57330ec31b96a6c2d89f8fcb36 (diff) | |
| parent | 33b8830a85242ad09898a0c90a6f0494c34132ca (diff) | |
| download | nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.tar nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.tar.gz nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.tar.bz2 nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.tar.lz nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.tar.xz nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.tar.zst nixlib-205fc55ea29a843f28b8fc1932cf1b88fce6bc1d.zip | |
Merge remote-tracking branch 'upstream/staging' into compiler-rt
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/brotli/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/compression/gzip/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/xz/default.nix | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 707b8f0d799f..1a42ba03d464 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "brotli-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "1hlkqgkm2gv6q83dswg6b19hpw8j33y6iw924j8r647pd4qg1xs7"; + sha256 = "0n5snycxgwqj2v8sgxiqxq4zqh5ydx70dr7qa4ygizs02ms69n1i"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index cfe41d3dfe7a..c39216f1e0cc 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { # In stdenv-linux, prevent a dependency on bootstrap-tools. makeFlags = "SHELL=/bin/sh GREP=grep"; + doCheck = false; # fails + meta = { homepage = https://www.gnu.org/software/gzip/; description = "GNU zip compression program"; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index da3a537da283..37c0c6d1c7e8 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.2.3"; + name = "xz-5.2.4"; src = fetchurl { url = "https://tukaani.org/xz/${name}.tar.bz2"; - sha256 = "1ha08wxcldgcl81021x5nhknr47s1p95ljfkka4sqah5w5ns377x"; + sha256 = "1gxpayfagb4v7xfhs2w6h7k56c6hwwav1rk48bj8hggljlmgs4rk"; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; |