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

Merge pull request #198637 from prusnak/miniupnpc

Browse Source
This commit is contained in:
Sandro 2022-11-01 18:17:18 +01:00 committed by GitHub
commit 597ed547fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 43 additions and 54 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 =
{ pkgs, nodes, ... }:
{ environment.systemPackages = [ pkgs.miniupnpc_2 pkgs.netcat ];
{ environment.systemPackages = [ pkgs.miniupnpc pkgs.netcat ];
virtualisation.vlans = [ 2 ];
networking.defaultGateway = internalRouterAddress;
networking.interfaces.eth1.ipv4.addresses = [
@ -65,7 +65,7 @@ in
client2 =
{ pkgs, ... }:
{ environment.systemPackages = [ pkgs.miniupnpc_2 ];
{ environment.systemPackages = [ pkgs.miniupnpc ];
virtualisation.vlans = [ 1 ];
networking.interfaces.eth1.ipv4.addresses = [
{ address = externalClient2Address; prefixLength = 24; }

4
pkgs/applications/blockchains/groestlcoin/default.nix
View File

@ -10,7 +10,7 @@
, wrapQtAppsHook ? null
, boost
, libevent
, miniupnpc_2
, miniupnpc
, zeromq
, zlib
, db53
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]
++ lib.optionals withGui [ wrapQtAppsHook ];
buildInputs = [ boost libevent miniupnpc_2 zeromq zlib ]
buildInputs = [ boost libevent miniupnpc zeromq zlib ]
++ lib.optionals withWallet [ db53 sqlite ]
++ lib.optionals withGui [ qrencode qtbase qttools ];

4
pkgs/applications/blockchains/wownero/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitea, cmake, boost, miniupnpc_2, openssl, unbound
{ lib, stdenv, fetchFromGitea, cmake, boost, miniupnpc, openssl, unbound
, readline, libsodium, rapidjson
}:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [
boost miniupnpc_2 openssl unbound rapidjson readline libsodium
boost miniupnpc openssl unbound rapidjson readline libsodium
];
postUnpack = ''

4
pkgs/applications/graphics/hydrus/default.nix
View File

@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, wrapQtAppsHook
, miniupnpc_2
, miniupnpc
, ffmpeg
, enableSwftools ? false
, swftools
@ -108,7 +108,7 @@ python3Packages.buildPythonPackage rec {
dontWrapQtApps = true;
preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg miniupnpc_2 ]})
makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg miniupnpc ]})
'';
meta = with lib; {

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

@ -1,41 +1,35 @@
{ lib, stdenv, fetchurl, which, cctools }:
{ lib
, stdenv
, fetchurl
, which
, cctools
}:
let
generic = { version, sha256 }:
stdenv.mkDerivation rec {
pname = "miniupnpc";
inherit version;
src = fetchurl {
url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz";
inherit sha256;
};
stdenv.mkDerivation rec {
pname = "miniupnpc";
version = "2.2.4";
nativeBuildInputs = lib.optionals stdenv.isDarwin [ which cctools ];
patches = lib.optional stdenv.isFreeBSD ./freebsd.patch;
doCheck = !stdenv.isFreeBSD;
makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ];
postInstall = ''
chmod +x "$out"/lib/libminiupnpc${stdenv.hostPlatform.extensions.sharedLibrary}
'';
meta = with lib; {
homepage = "https://miniupnp.tuxfamily.org/";
description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
platforms = with platforms; linux ++ freebsd ++ darwin;
license = licenses.bsd3;
};
};
in {
miniupnpc_2 = generic {
version = "2.2.4";
src = fetchurl {
url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz";
sha256 = "0jrc84lkc7xb53rb8dbswxrxj21ndj1iiclmk3r9wkp6xm55w6j8";
};
miniupnpc_1 = generic {
version = "1.9.20160209";
sha256 = "0vsbv6a8by67alx4rxfsrxxsnmq74rqlavvvwiy56whxrkm728ap";
nativeBuildInputs = lib.optionals stdenv.isDarwin [ which cctools ];
patches = lib.optional stdenv.isFreeBSD ./freebsd.patch;
doCheck = !stdenv.isFreeBSD;
makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ];
postInstall = ''
chmod +x "$out"/lib/libminiupnpc${stdenv.hostPlatform.extensions.sharedLibrary}
'';
meta = with lib; {
homepage = "https://miniupnp.tuxfamily.org/";
description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
platforms = with platforms; linux ++ freebsd ++ darwin;
license = licenses.bsd3;
};
}

1
pkgs/top-level/aliases.nix
View File

@ -914,6 +914,7 @@ mapAliases ({
minetestclient_4 = throw "minetestclient_4 has been removed from Nixpkgs; current version is available at minetest or minetestclient"; # added 2022-02-01
minetestserver_4 = throw "minetestserver_4 has been removed from Nixpkgs; current version is available at minetestserver"; # added 2022-02-01
minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14
miniupnpc_1 = throw "miniupnpc_1 has been removed; current version is available at miniupnpc"; # Added 2022-10-30
mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15
mlt-qt5 = throw "'mlt-qt5' has been renamed to/replaced by 'libsForQt5.mlt'"; # Converted to throw 2022-02-22
mobile_broadband_provider_info = throw "'mobile_broadband_provider_info' has been renamed to/replaced by 'mobile-broadband-provider-info'"; # Converted to throw 2022-02-22

16
pkgs/top-level/all-packages.nix
View File

@ -9245,10 +9245,9 @@ with pkgs;
minissdpd = callPackage ../tools/networking/minissdpd { };
inherit (callPackage ../tools/networking/miniupnpc
{ inherit (darwin) cctools; })
miniupnpc_1 miniupnpc_2;
miniupnpc = miniupnpc_1;
miniupnpc = callPackage ../tools/networking/miniupnpc {
inherit (darwin) cctools;
};
miniupnpd = callPackage ../tools/networking/miniupnpd { };
@ -28789,7 +28788,7 @@ with pkgs;
gum = callPackage ../applications/misc/gum { };
hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
inherit miniupnpc_2 swftools;
inherit miniupnpc swftools;
inherit (qt5) wrapQtAppsHook;
};
@ -33300,21 +33299,18 @@ with pkgs;
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {
boost = boost17x;
miniupnpc = miniupnpc_2;
withGui = true;
inherit (darwin) autoSignDarwinBinariesHook;
};
bitcoind = callPackage ../applications/blockchains/bitcoin {
boost = boost17x;
miniupnpc = miniupnpc_2;
withGui = false;
inherit (darwin) autoSignDarwinBinariesHook;
};
bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots {
boost = boost17x;
miniupnpc = miniupnpc_2;
withGui = false;
inherit (darwin) autoSignDarwinBinariesHook;
};
@ -33402,13 +33398,11 @@ with pkgs;
};
elements = libsForQt5.callPackage ../applications/blockchains/elements {
miniupnpc = miniupnpc_2;
withGui = true;
boost = boost175;
inherit (darwin) autoSignDarwinBinariesHook;
};
elementsd = callPackage ../applications/blockchains/elements {
miniupnpc = miniupnpc_2;
withGui = false;
boost = boost175;
inherit (darwin) autoSignDarwinBinariesHook;
@ -33567,7 +33561,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; };
particl-core = callPackage ../applications/blockchains/particl-core { };
quorum = callPackage ../applications/blockchains/quorum { };