dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

zlib: 1.3 -> 1.3.1

Browse Source 
Changes: https://github.com/madler/zlib/releases/tag/v1.3.1
This commit is contained in:
Sergei Trofimovich 2024-01-23 10:19:35 +00:00
parent 9dbf5074db
commit 5c5f9bf221
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/minizip/default.nix
View File

@ -4,14 +4,6 @@ stdenv.mkDerivation {
pname = "minizip"; pname = "minizip";
inherit (zlib) src version; inherit (zlib) src version;
patches = [
(fetchpatch {
name = "CVE-2023-45853.patch";
url = "https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c.patch";
hash = "sha256-yayfe1g9HsvgMN28WF/MYkH7dGMX4PsK53FcnfL3InM=";
})
];
patchFlags = [ "-p3" ]; patchFlags = [ "-p3" ];
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];

11
pkgs/development/libraries/zlib/default.nix
View File

@ -9,6 +9,7 @@
# If false, and if `{ static = true; }`, the .a stays in the main output. # If false, and if `{ static = true; }`, the .a stays in the main output.
, splitStaticOutput ? shared && static , splitStaticOutput ? shared && static
, testers , testers
, minizip
}: }:
# Without either the build will actually still succeed because the build # Without either the build will actually still succeed because the build
@ -24,7 +25,7 @@ assert splitStaticOutput -> static;
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "zlib"; pname = "zlib";
version = "1.3"; version = "1.3.1";
src = let src = let
inherit (finalAttrs) version; inherit (finalAttrs) version;
@ -35,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
# Stable archive path, but captcha can be encountered, causing hash mismatch. # Stable archive path, but captcha can be encountered, causing hash mismatch.
"https://www.zlib.net/fossils/zlib-${version}.tar.gz" "https://www.zlib.net/fossils/zlib-${version}.tar.gz"
]; ];
hash = "sha256-/wukwpIBPbwnUws6geH5qBPNOd4Byl4Pi/NVcC76WT4="; hash = "sha256-mpOyt9/ax3zrpaVYpYDnRmfdb+3kWFuR7vtg8Dty3yM=";
}; };
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
@ -128,7 +129,11 @@ stdenv.mkDerivation (finalAttrs: {
"SHARED_MODE=1" "SHARED_MODE=1"
]; ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; passthru.tests = {
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
# uses `zlib` derivation:
inherit minizip;
};
meta = with lib; { meta = with lib; {
homepage = "https://zlib.net"; homepage = "https://zlib.net";