public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61363 from aanderse/miniupnpc

Browse Source 
miniupnpc_2: 2.1 -> 2.1.20190408, miniupnpd: 2.1 -> 2.1.20190502
This commit is contained in:
Aaron Andersen 2019-05-15 20:56:59 -04:00 committed by GitHub
commit ed6ccd1b27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/tests/upnp.nix
View File

@ -47,7 +47,7 @@ in
client1 = client1 =
{ pkgs, nodes, ... }: { pkgs, nodes, ... }:
{ environment.systemPackages = [ pkgs.miniupnpc pkgs.netcat ]; { environment.systemPackages = [ pkgs.miniupnpc_2 pkgs.netcat ];
virtualisation.vlans = [ 2 ]; virtualisation.vlans = [ 2 ];
networking.defaultGateway = internalRouterAddress; networking.defaultGateway = internalRouterAddress;
networking.interfaces.eth1.ipv4.addresses = [ networking.interfaces.eth1.ipv4.addresses = [
@ -63,7 +63,7 @@ in
client2 = client2 =
{ pkgs, ... }: { pkgs, ... }:
{ environment.systemPackages = [ pkgs.miniupnpc ]; { environment.systemPackages = [ pkgs.miniupnpc_2 ];
virtualisation.vlans = [ 1 ]; virtualisation.vlans = [ 1 ];
networking.interfaces.eth1.ipv4.addresses = [ networking.interfaces.eth1.ipv4.addresses = [
{ address = externalClient2Address; prefixLength = 24; } { address = externalClient2Address; prefixLength = 24; }

4
pkgs/tools/networking/miniupnpc/default.nix
View File

@ -28,8 +28,8 @@ let
}; };
in { in {
miniupnpc_2 = generic { miniupnpc_2 = generic {
version = "2.1"; version = "2.1.20190408";
sha256 = "1ik440yspbp3clr4m01xsl9skwyrzcvzb5nbm3i0g9x53vhbb7z1"; sha256 = "1v0l2m8j7r6jiy871d6v11ls243xqn6s3856iwd3bmk5c37npi50";
}; };
miniupnpc_1 = generic { miniupnpc_1 = generic {
version = "1.9.20160209"; version = "1.9.20160209";

4
pkgs/tools/networking/miniupnpd/default.nix
View File

@ -6,11 +6,11 @@ let
scriptBinEnv = lib.makeBinPath [ which iproute iptables gnused coreutils gawk ]; scriptBinEnv = lib.makeBinPath [ which iproute iptables gnused coreutils gawk ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "miniupnpd-2.1"; name = "miniupnpd-2.1.20190502";
src = fetchurl { src = fetchurl {
url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
sha256 = "1hg0zzvvzfgpnmngmd3ffnsk9x18lwlxlpw5jgh7y6b1jrvr824m"; sha256 = "1m8d0g9b0bjwsnqccw1yapp6n0jghmgzwixwjflwmvi2fi6hdp4b";
name = "${name}.tar.gz"; name = "${name}.tar.gz";
}; };