From f2b0caeab6851a2136c295bb1ce14508fc75e175 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 3 Jun 2025 19:59:23 +0530 Subject: [PATCH 1/3] miniupnpc: 2.3.2 -> 2.3.3 Signed-off-by: phanirithvij --- pkgs/by-name/mi/miniupnpc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/miniupnpc/package.nix b/pkgs/by-name/mi/miniupnpc/package.nix index 2078657acda4..08a98bbe4c00 100644 --- a/pkgs/by-name/mi/miniupnpc/package.nix +++ b/pkgs/by-name/mi/miniupnpc/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "miniupnpc"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "miniupnp"; repo = "miniupnp"; tag = "miniupnpc_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-Fjd4JPk6Uc7cPPQu9NiBv82XArd11TW+7sTL3wC9/+s="; + hash = "sha256-8EWchUppW4H2kEUCGBXIk1meARJj2usKKO5gFYPoW3s="; }; sourceRoot = "${src.name}/miniupnpc"; From 937f8bf22420e27f54f0caff2a3b82adb2d62f23 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 3 Jun 2025 19:44:38 +0530 Subject: [PATCH 2/3] miniupnpc: fix external-ip command Signed-off-by: phanirithvij --- pkgs/by-name/mi/miniupnpc/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/mi/miniupnpc/package.nix b/pkgs/by-name/mi/miniupnpc/package.nix index 08a98bbe4c00..da622d060320 100644 --- a/pkgs/by-name/mi/miniupnpc/package.nix +++ b/pkgs/by-name/mi/miniupnpc/package.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { mv $out/bin/upnpc-* $out/bin/upnpc mv $out/bin/upnp-listdevices-* $out/bin/upnp-listdevices mv $out/bin/external-ip.sh $out/bin/external-ip + chmod +x $out/bin/external-ip + patchShebangs $out/bin/external-ip + substituteInPlace $out/bin/external-ip \ + --replace-fail "upnpc" $out/bin/upnpc ''; __darwinAllowLocalNetworking = true; From 21205258f5bb0a07cd397b7384c3c283455eda59 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 3 Jun 2025 19:59:37 +0530 Subject: [PATCH 3/3] miniupnpc: finalAttrs Signed-off-by: phanirithvij --- pkgs/by-name/mi/miniupnpc/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mi/miniupnpc/package.nix b/pkgs/by-name/mi/miniupnpc/package.nix index da622d060320..d49f0c77a468 100644 --- a/pkgs/by-name/mi/miniupnpc/package.nix +++ b/pkgs/by-name/mi/miniupnpc/package.nix @@ -7,18 +7,18 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "miniupnpc"; version = "2.3.3"; src = fetchFromGitHub { owner = "miniupnp"; repo = "miniupnp"; - tag = "miniupnpc_${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "miniupnpc_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-8EWchUppW4H2kEUCGBXIk1meARJj2usKKO5gFYPoW3s="; }; - sourceRoot = "${src.name}/miniupnpc"; + sourceRoot = "${finalAttrs.src.name}/miniupnpc"; nativeBuildInputs = [ cmake ]; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; mainProgram = "upnpc"; }; -} +})