diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/compression')
5 files changed, 24 insertions, 14 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix index bf20e0119ec6..f4f0ac41563a 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/brotli/default.nix @@ -4,21 +4,22 @@ stdenv.mkDerivation rec { pname = "brotli"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"; + sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; nativeBuildInputs = [ cmake ]; patches = stdenv.lib.optional staticOnly (fetchpatch { - # from https://github.com/google/brotli/pull/655 - url = "https://github.com/google/brotli/commit/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch"; - sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg"; + # context from https://github.com/google/brotli/pull/655 + # updated patch from https://github.com/google/brotli/pull/655 + url = "https://github.com/google/brotli/commit/47a554804ceabb899ae924aaee54df806053d0d1.patch"; + sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; }); cmakeFlags = [] @@ -32,7 +33,14 @@ stdenv.mkDerivation rec { # This breaks on Darwin because our cmake hook tries to make a build folder # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) - prePatch = "rm BUILD"; + prePatch = '' + rm BUILD + + # Upstream fixed this reference to runtime-path after the release + # and with this references g++ complains about invalid option -R + sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in + cat scripts/libbrotli*.pc.in + ''; # Don't bother with "man" output for now, # it currently only makes the manpages hard to use. @@ -61,7 +69,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; [ freezeboy ]; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/lz4/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/lz4/default.nix index 6bc365b8e1e1..0124a0b3d63b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/compression/lz4/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/lz4/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "lz4"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { - sha256 = "0lpaypmk70ag2ks3kf2dl4ac3ba40n5kc1ainkp9wfjawz76mh61"; + sha256 = "1w02kazh1fps3sji2sn89fz862j1199c5ajrqcgl1bnlxj09kcbz"; rev = "v${version}"; repo = pname; owner = pname; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/pigz/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/pigz/default.nix index 1953b793657e..07c7bf95607d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/compression/pigz/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/pigz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, utillinux }: +{ stdenv, fetchurl, zlib, util-linux }: let name = "pigz"; version = "2.4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux; + buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux util-linux; makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/xz/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/xz/default.nix index 5cf88288d813..0b6082bb5780 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/compression/xz/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/xz/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://tukaani.org/xz/"; - description = "XZ, general-purpose data compression software, successor of LZMA"; + description = "A general-purpose data compression software, successor of LZMA"; longDescription = '' XZ Utils is free general-purpose data compression software with high diff --git a/infra/libkookie/nixpkgs/pkgs/tools/compression/zstd/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/compression/zstd/default.nix index 8ce434741a55..c26ca507525f 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ bash ]; + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isUnix bash; patches = [ ./playtests-darwin.patch @@ -72,7 +72,9 @@ stdenv.mkDerivation rec { --replace "zstdcat" "$bin/bin/zstdcat" ''; - outputs = [ "bin" "dev" "man" "out" ]; + outputs = [ "bin" "dev" ] + ++ stdenv.lib.optional stdenv.hostPlatform.isUnix "man" + ++ [ "out" ]; meta = with stdenv.lib; { description = "Zstandard real-time compression algorithm"; |