From 8d24a891da8fd47d899822790516ac8ddc6e5e41 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 12 May 2019 07:52:22 -0400 Subject: [PATCH 1/3] miniupnpc_2: 2.1 -> 2.1.20190408 --- pkgs/tools/networking/miniupnpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 88b4b7fab88..82b961b6a12 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -28,8 +28,8 @@ let }; in { miniupnpc_2 = generic { - version = "2.1"; - sha256 = "1ik440yspbp3clr4m01xsl9skwyrzcvzb5nbm3i0g9x53vhbb7z1"; + version = "2.1.20190408"; + sha256 = "1v0l2m8j7r6jiy871d6v11ls243xqn6s3856iwd3bmk5c37npi50"; }; miniupnpc_1 = generic { version = "1.9.20160209"; From dff50d19591f229d08e108b36409d8f3278b3bdf Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 12 May 2019 07:52:59 -0400 Subject: [PATCH 2/3] miniupnpd: 2.1 -> 2.1.20190502 --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index f3cd9ea6a81..f65c0c63370 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -6,11 +6,11 @@ let scriptBinEnv = lib.makeBinPath [ which iproute iptables gnused coreutils gawk ]; in stdenv.mkDerivation rec { - name = "miniupnpd-2.1"; + name = "miniupnpd-2.1.20190502"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1hg0zzvvzfgpnmngmd3ffnsk9x18lwlxlpw5jgh7y6b1jrvr824m"; + sha256 = "1m8d0g9b0bjwsnqccw1yapp6n0jghmgzwixwjflwmvi2fi6hdp4b"; name = "${name}.tar.gz"; }; From 496d9f97e687d11cff32e83e462f70c0b91dcad3 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 12 May 2019 07:53:30 -0400 Subject: [PATCH 3/3] nixos/miniupnpd: update test to use pkgs.miniupnpc_2 --- nixos/tests/upnp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/upnp.nix b/nixos/tests/upnp.nix index 3f2dd13fb56..98344aee3ef 100644 --- a/nixos/tests/upnp.nix +++ b/nixos/tests/upnp.nix @@ -47,7 +47,7 @@ in client1 = { pkgs, nodes, ... }: - { environment.systemPackages = [ pkgs.miniupnpc pkgs.netcat ]; + { environment.systemPackages = [ pkgs.miniupnpc_2 pkgs.netcat ]; virtualisation.vlans = [ 2 ]; networking.defaultGateway = internalRouterAddress; networking.interfaces.eth1.ipv4.addresses = [ @@ -63,7 +63,7 @@ in client2 = { pkgs, ... }: - { environment.systemPackages = [ pkgs.miniupnpc ]; + { environment.systemPackages = [ pkgs.miniupnpc_2 ]; virtualisation.vlans = [ 1 ]; networking.interfaces.eth1.ipv4.addresses = [ { address = externalClient2Address; prefixLength = 24; }