From b4b50abcb04b78011c4e122308fe61e3573d4184 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 28 Apr 2024 02:10:51 +0000 Subject: [PATCH 1/4] =?UTF-8?q?miniz:=202.2.0=20=E2=86=92=203.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/miniz/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/miniz/default.nix b/pkgs/development/libraries/miniz/default.nix index 8592dc5f1224..7583ad9f0f9e 100644 --- a/pkgs/development/libraries/miniz/default.nix +++ b/pkgs/development/libraries/miniz/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { pname = "miniz"; - version = "2.2.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "richgel999"; repo = pname; rev = version; - sha256 = "sha256-7hc/yNJh4sD5zGQLeHjowbUtV/1mUDQre1tp9yKMSSY="; + hash = "sha256-3J0bkr2Yk+MJXilUqOCHsWzuykySv5B1nepmucvA4hg="; }; nativeBuildInputs = [ cmake ]; postFixup = '' - substituteInPlace "$out"/share/pkgconfig/miniz.pc \ - --replace '=''${prefix}//' '=/' \ - --replace '=''${exec_prefix}//' '=/' + substituteInPlace "$out"/lib/pkgconfig/miniz.pc \ + --replace-fail '=''${prefix}//' '=/' \ + --replace-fail '=''${exec_prefix}//' '=/' ''; meta = with lib; { From cbf2537a12b7eb2806792fe379dff13f764a87a5 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 28 Apr 2024 02:12:29 +0000 Subject: [PATCH 2/4] miniz: add `updateScript` --- pkgs/development/libraries/miniz/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/miniz/default.nix b/pkgs/development/libraries/miniz/default.nix index 7583ad9f0f9e..d67fab346f17 100644 --- a/pkgs/development/libraries/miniz/default.nix +++ b/pkgs/development/libraries/miniz/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, fetchFromGitHub +, nix-update-script +, stdenv +, cmake +}: stdenv.mkDerivation rec { pname = "miniz"; @@ -10,6 +15,7 @@ stdenv.mkDerivation rec { rev = version; hash = "sha256-3J0bkr2Yk+MJXilUqOCHsWzuykySv5B1nepmucvA4hg="; }; + passthru.updateScript = nix-update-script {}; nativeBuildInputs = [ cmake ]; From 21192a7561a55273b4e1f4a0d4aa6bc5b89f5231 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 28 Apr 2024 02:13:04 +0000 Subject: [PATCH 3/4] miniz: add pkgconf metadata, test, and validation --- pkgs/development/libraries/miniz/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/miniz/default.nix b/pkgs/development/libraries/miniz/default.nix index d67fab346f17..24bf493ce2ea 100644 --- a/pkgs/development/libraries/miniz/default.nix +++ b/pkgs/development/libraries/miniz/default.nix @@ -2,22 +2,24 @@ , fetchFromGitHub , nix-update-script , stdenv +, testers +, validatePkgConfig , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "miniz"; version = "3.0.2"; src = fetchFromGitHub { owner = "richgel999"; - repo = pname; - rev = version; + repo = "miniz"; + rev = finalAttrs.version; hash = "sha256-3J0bkr2Yk+MJXilUqOCHsWzuykySv5B1nepmucvA4hg="; }; passthru.updateScript = nix-update-script {}; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake validatePkgConfig ]; postFixup = '' substituteInPlace "$out"/lib/pkgconfig/miniz.pc \ @@ -25,11 +27,14 @@ stdenv.mkDerivation rec { --replace-fail '=''${exec_prefix}//' '=/' ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Single C source file zlib-replacement library"; homepage = "https://github.com/richgel999/miniz"; license = licenses.mit; maintainers = with maintainers; [ astro ]; platforms = platforms.unix; + pkgConfigModules = [ "miniz" ]; }; -} +}) From 768e3b133718ddf5c1fd24f8cc4a7a5c1fe901c0 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 29 Apr 2024 13:41:38 +0000 Subject: [PATCH 4/4] miniz: set `strictDeps` --- pkgs/development/libraries/miniz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/miniz/default.nix b/pkgs/development/libraries/miniz/default.nix index 24bf493ce2ea..0c4d902f40bb 100644 --- a/pkgs/development/libraries/miniz/default.nix +++ b/pkgs/development/libraries/miniz/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation (finalAttrs: { }; passthru.updateScript = nix-update-script {}; + strictDeps = true; nativeBuildInputs = [ cmake validatePkgConfig ]; postFixup = ''