From 83cb6c00f0353a5a88e9cfea57bc8fac0d872573 Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Sat, 18 Mar 2023 00:38:07 +0200 Subject: [PATCH 1/2] miniupnpd: use iptables-legacy --- pkgs/tools/networking/miniupnpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index b3a10fee2c4e..bebd95baf776 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchurl, iptables, libuuid, openssl, pkg-config +{ stdenv, lib, fetchurl, iptables-legacy, libuuid, openssl, pkg-config , which, iproute2, gnused, coreutils, gawk, makeWrapper , nixosTests }: let - scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ]; + scriptBinEnv = lib.makeBinPath [ which iproute2 iptables-legacy gnused coreutils gawk ]; in stdenv.mkDerivation rec { pname = "miniupnpd"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0crv975qqppnj27jba96yysq2911y49vjd74sp9vnjb54z0d9pyi"; }; - buildInputs = [ iptables libuuid openssl ]; + buildInputs = [ iptables-legacy libuuid openssl ]; nativeBuildInputs= [ pkg-config makeWrapper ]; From b38d7e5ea69188678aa28061b98e182a380ee9c5 Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Sat, 18 Mar 2023 12:22:03 +0200 Subject: [PATCH 2/2] miniupnpd: add nixosTests.upnp to passthru.tests --- pkgs/tools/networking/miniupnpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index bebd95baf776..0e30b2181053 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { passthru.tests = { bittorrent-integration = nixosTests.bittorrent; + inherit (nixosTests) upnp; }; meta = with lib; {