pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #198431 from prusnak/miniupnp

miniupnpc_2: 2.1.20190625 -> 2.2.4 + miniupnpd: 2.1.20190502 -> 2.3.1

authored by Pavol Rusnak and committed by GitHub 200277ea 4b03b7b2

+13 -14
unified split
+4 -5
pkgs/tools/networking/miniupnpc/default.nix
··· 6 pname = "miniupnpc"; 7 inherit version; 8 src = fetchurl { 9 - name = "${pname}-${version}.tar.gz"; 10 - url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; 11 inherit sha256; 12 }; 13 ··· 24 ''; 25 26 meta = with lib; { 27 - homepage = "http://miniupnp.free.fr/"; 28 description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; 29 platforms = with platforms; linux ++ freebsd ++ darwin; 30 license = licenses.bsd3; ··· 32 }; 33 in { 34 miniupnpc_2 = generic { 35 - version = "2.1.20190625"; 36 - sha256 = "1yqp0d8x5ldjfma5x2vhpg1aaafdg0470ismccixww3rzpbza8w7"; 37 }; 38 miniupnpc_1 = generic { 39 version = "1.9.20160209";
··· 6 pname = "miniupnpc"; 7 inherit version; 8 src = fetchurl { 9 + url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz"; 10 inherit sha256; 11 }; 12 ··· 23 ''; 24 25 meta = with lib; { 26 + homepage = "https://miniupnp.tuxfamily.org/"; 27 description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; 28 platforms = with platforms; linux ++ freebsd ++ darwin; 29 license = licenses.bsd3; ··· 31 }; 32 in { 33 miniupnpc_2 = generic { 34 + version = "2.2.4"; 35 + sha256 = "0jrc84lkc7xb53rb8dbswxrxj21ndj1iiclmk3r9wkp6xm55w6j8"; 36 }; 37 miniupnpc_1 = generic { 38 version = "1.9.20160209";
+9 -9
pkgs/tools/networking/miniupnpd/default.nix
··· 1 - { stdenv, lib, fetchurl, iptables, libuuid, pkg-config 2 , which, iproute2, gnused, coreutils, gawk, makeWrapper 3 , nixosTests 4 }: ··· 8 in 9 stdenv.mkDerivation rec { 10 pname = "miniupnpd"; 11 - version = "2.1.20190502"; 12 13 src = fetchurl { 14 - url = "http://miniupnp.free.fr/files/download.php?file=miniupnpd-${version}.tar.gz"; 15 - sha256 = "1m8d0g9b0bjwsnqccw1yapp6n0jghmgzwixwjflwmvi2fi6hdp4b"; 16 - name = "miniupnpd-${version}.tar.gz"; 17 }; 18 19 - buildInputs = [ iptables libuuid ]; 20 nativeBuildInputs= [ pkg-config makeWrapper ]; 21 22 - makefile = "Makefile.linux"; 23 24 - buildFlags = [ "miniupnpd" "genuuid" ]; 25 26 installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; 27 ··· 37 }; 38 39 meta = with lib; { 40 - homepage = "http://miniupnp.free.fr/"; 41 description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; 42 platforms = platforms.linux; 43 license = licenses.bsd3;
··· 1 + { stdenv, lib, fetchurl, iptables, libuuid, openssl, pkg-config 2 , which, iproute2, gnused, coreutils, gawk, makeWrapper 3 , nixosTests 4 }: ··· 8 in 9 stdenv.mkDerivation rec { 10 pname = "miniupnpd"; 11 + version = "2.3.1"; 12 13 src = fetchurl { 14 + url = "https://miniupnp.tuxfamily.org/files/miniupnpd-${version}.tar.gz"; 15 + sha256 = "0crv975qqppnj27jba96yysq2911y49vjd74sp9vnjb54z0d9pyi"; 16 }; 17 18 + buildInputs = [ iptables libuuid openssl ]; 19 nativeBuildInputs= [ pkg-config makeWrapper ]; 20 21 22 + # ./configure is not a standard configure file, errors with: 23 + # Option not recognized : --prefix= 24 + dontAddPrefix = true; 25 26 installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; 27 ··· 37 }; 38 39 meta = with lib; { 40 + homepage = "https://miniupnp.tuxfamily.org/"; 41 description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; 42 platforms = platforms.linux; 43 license = licenses.bsd3;