From 2983baa4e7b742bee16b41632d65109340261550 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 21 Jun 2023 14:50:37 +0200 Subject: [PATCH 1/2] zlib-ng: 2.0.7 -> 2.1.2 --- pkgs/development/libraries/zlib-ng/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/development/libraries/zlib-ng/default.nix index 482aa11d0b1b..ac314b754513 100644 --- a/pkgs/development/libraries/zlib-ng/default.nix +++ b/pkgs/development/libraries/zlib-ng/default.nix @@ -1,22 +1,29 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch +, cmake, pkg-config, gtest , withZlibCompat ? false }: stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.0.7"; + version = "2.1.2"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - sha256 = "sha256-Q+u71XXfHafmTL8tmk4XcgpbSdBIunveL9Q78LqiZF0="; + sha256 = "sha256-6IEH9IQsBiNwfAZAemmP0/p6CTOzxEKyekciuH6pLhw="; }; + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/zlib-ng/zlib-ng/pull/1519.patch"; + hash = "sha256-itobS8kJ2Hj3RfjslVkvEVdQ4t5eeIrsA9muRZt03pE="; + }) + ]; + outputs = [ "out" "dev" "bin" ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config gtest ]; cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=/" From 0fe7fee623de691acff1db0178de01e39a22319d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 21 Jun 2023 14:54:08 +0200 Subject: [PATCH 2/2] minizip-ng: 3.0.10 -> 4.0.0 --- pkgs/development/libraries/minizip-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 9f76e213c56f..9be33beff60e 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "3.0.10"; + version = "4.0.0"; src = fetchFromGitHub { owner = "zlib-ng"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "sha256-ynYAWF570S6MpD1WXbUC3cu+chL3+AhsMHr15l+LYVg="; + sha256 = "sha256-YgBOsznV1JtnpLUJeqZ06zvdB3tNbOlFhhLd1pMJhEM="; }; nativeBuildInputs = [ cmake pkg-config ];