forked from mirrors/nixpkgs
miniupnpc_1: drop
- it is time to drop 6 years old version - no package really requires miniupnpc 1.x - miniupnpc package now defaults to 2.x
This commit is contained in:
parent
08fbb5de2d
commit
d7788c7303
|
@ -47,7 +47,7 @@ in
|
||||||
|
|
||||||
client1 =
|
client1 =
|
||||||
{ pkgs, nodes, ... }:
|
{ pkgs, nodes, ... }:
|
||||||
{ environment.systemPackages = [ pkgs.miniupnpc_2 pkgs.netcat ];
|
{ environment.systemPackages = [ pkgs.miniupnpc pkgs.netcat ];
|
||||||
virtualisation.vlans = [ 2 ];
|
virtualisation.vlans = [ 2 ];
|
||||||
networking.defaultGateway = internalRouterAddress;
|
networking.defaultGateway = internalRouterAddress;
|
||||||
networking.interfaces.eth1.ipv4.addresses = [
|
networking.interfaces.eth1.ipv4.addresses = [
|
||||||
|
@ -65,7 +65,7 @@ in
|
||||||
|
|
||||||
client2 =
|
client2 =
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{ environment.systemPackages = [ pkgs.miniupnpc_2 ];
|
{ environment.systemPackages = [ pkgs.miniupnpc ];
|
||||||
virtualisation.vlans = [ 1 ];
|
virtualisation.vlans = [ 1 ];
|
||||||
networking.interfaces.eth1.ipv4.addresses = [
|
networking.interfaces.eth1.ipv4.addresses = [
|
||||||
{ address = externalClient2Address; prefixLength = 24; }
|
{ address = externalClient2Address; prefixLength = 24; }
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
, wrapQtAppsHook ? null
|
, wrapQtAppsHook ? null
|
||||||
, boost
|
, boost
|
||||||
, libevent
|
, libevent
|
||||||
, miniupnpc_2
|
, miniupnpc
|
||||||
, zeromq
|
, zeromq
|
||||||
, zlib
|
, zlib
|
||||||
, db53
|
, db53
|
||||||
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||||
++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]
|
++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]
|
||||||
++ lib.optionals withGui [ wrapQtAppsHook ];
|
++ lib.optionals withGui [ wrapQtAppsHook ];
|
||||||
|
|
||||||
buildInputs = [ boost libevent miniupnpc_2 zeromq zlib ]
|
buildInputs = [ boost libevent miniupnpc zeromq zlib ]
|
||||||
++ lib.optionals withWallet [ db53 sqlite ]
|
++ lib.optionals withWallet [ db53 sqlite ]
|
||||||
++ lib.optionals withGui [ qrencode qtbase qttools ];
|
++ lib.optionals withGui [ qrencode qtbase qttools ];
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchFromGitea, cmake, boost, miniupnpc_2, openssl, unbound
|
{ lib, stdenv, fetchFromGitea, cmake, boost, miniupnpc, openssl, unbound
|
||||||
, readline, libsodium, rapidjson
|
, readline, libsodium, rapidjson
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost miniupnpc_2 openssl unbound rapidjson readline libsodium
|
boost miniupnpc openssl unbound rapidjson readline libsodium
|
||||||
];
|
];
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, wrapQtAppsHook
|
, wrapQtAppsHook
|
||||||
, miniupnpc_2
|
, miniupnpc
|
||||||
, ffmpeg
|
, ffmpeg
|
||||||
, enableSwftools ? false
|
, enableSwftools ? false
|
||||||
, swftools
|
, swftools
|
||||||
|
@ -108,7 +108,7 @@ python3Packages.buildPythonPackage rec {
|
||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||||
makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg miniupnpc_2 ]})
|
makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg miniupnpc ]})
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -1,41 +1,35 @@
|
||||||
{ lib, stdenv, fetchurl, which, cctools }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, which
|
||||||
|
, cctools
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
stdenv.mkDerivation rec {
|
||||||
generic = { version, sha256 }:
|
pname = "miniupnpc";
|
||||||
stdenv.mkDerivation rec {
|
version = "2.2.4";
|
||||||
pname = "miniupnpc";
|
|
||||||
inherit version;
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz";
|
|
||||||
inherit sha256;
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [ which cctools ];
|
src = fetchurl {
|
||||||
|
url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz";
|
||||||
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";
|
|
||||||
sha256 = "0jrc84lkc7xb53rb8dbswxrxj21ndj1iiclmk3r9wkp6xm55w6j8";
|
sha256 = "0jrc84lkc7xb53rb8dbswxrxj21ndj1iiclmk3r9wkp6xm55w6j8";
|
||||||
};
|
};
|
||||||
miniupnpc_1 = generic {
|
|
||||||
version = "1.9.20160209";
|
nativeBuildInputs = lib.optionals stdenv.isDarwin [ which cctools ];
|
||||||
sha256 = "0vsbv6a8by67alx4rxfsrxxsnmq74rqlavvvwiy56whxrkm728ap";
|
|
||||||
|
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;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -912,6 +912,7 @@ mapAliases ({
|
||||||
minetestclient_4 = throw "minetestclient_4 has been removed from Nixpkgs; current version is available at minetest or minetestclient"; # added 2022-02-01
|
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
|
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
|
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
|
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
|
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
|
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
|
||||||
|
|
|
@ -9239,10 +9239,9 @@ with pkgs;
|
||||||
|
|
||||||
minissdpd = callPackage ../tools/networking/minissdpd { };
|
minissdpd = callPackage ../tools/networking/minissdpd { };
|
||||||
|
|
||||||
inherit (callPackage ../tools/networking/miniupnpc
|
miniupnpc = callPackage ../tools/networking/miniupnpc {
|
||||||
{ inherit (darwin) cctools; })
|
inherit (darwin) cctools;
|
||||||
miniupnpc_1 miniupnpc_2;
|
};
|
||||||
miniupnpc = miniupnpc_1;
|
|
||||||
|
|
||||||
miniupnpd = callPackage ../tools/networking/miniupnpd { };
|
miniupnpd = callPackage ../tools/networking/miniupnpd { };
|
||||||
|
|
||||||
|
@ -28775,7 +28774,7 @@ with pkgs;
|
||||||
gum = callPackage ../applications/misc/gum { };
|
gum = callPackage ../applications/misc/gum { };
|
||||||
|
|
||||||
hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
|
hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
|
||||||
inherit miniupnpc_2 swftools;
|
inherit miniupnpc swftools;
|
||||||
inherit (qt5) wrapQtAppsHook;
|
inherit (qt5) wrapQtAppsHook;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -33284,21 +33283,18 @@ with pkgs;
|
||||||
|
|
||||||
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {
|
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {
|
||||||
boost = boost17x;
|
boost = boost17x;
|
||||||
miniupnpc = miniupnpc_2;
|
|
||||||
withGui = true;
|
withGui = true;
|
||||||
inherit (darwin) autoSignDarwinBinariesHook;
|
inherit (darwin) autoSignDarwinBinariesHook;
|
||||||
};
|
};
|
||||||
|
|
||||||
bitcoind = callPackage ../applications/blockchains/bitcoin {
|
bitcoind = callPackage ../applications/blockchains/bitcoin {
|
||||||
boost = boost17x;
|
boost = boost17x;
|
||||||
miniupnpc = miniupnpc_2;
|
|
||||||
withGui = false;
|
withGui = false;
|
||||||
inherit (darwin) autoSignDarwinBinariesHook;
|
inherit (darwin) autoSignDarwinBinariesHook;
|
||||||
};
|
};
|
||||||
|
|
||||||
bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots {
|
bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots {
|
||||||
boost = boost17x;
|
boost = boost17x;
|
||||||
miniupnpc = miniupnpc_2;
|
|
||||||
withGui = false;
|
withGui = false;
|
||||||
inherit (darwin) autoSignDarwinBinariesHook;
|
inherit (darwin) autoSignDarwinBinariesHook;
|
||||||
};
|
};
|
||||||
|
@ -33386,13 +33382,11 @@ with pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
elements = libsForQt5.callPackage ../applications/blockchains/elements {
|
elements = libsForQt5.callPackage ../applications/blockchains/elements {
|
||||||
miniupnpc = miniupnpc_2;
|
|
||||||
withGui = true;
|
withGui = true;
|
||||||
boost = boost175;
|
boost = boost175;
|
||||||
inherit (darwin) autoSignDarwinBinariesHook;
|
inherit (darwin) autoSignDarwinBinariesHook;
|
||||||
};
|
};
|
||||||
elementsd = callPackage ../applications/blockchains/elements {
|
elementsd = callPackage ../applications/blockchains/elements {
|
||||||
miniupnpc = miniupnpc_2;
|
|
||||||
withGui = false;
|
withGui = false;
|
||||||
boost = boost175;
|
boost = boost175;
|
||||||
inherit (darwin) autoSignDarwinBinariesHook;
|
inherit (darwin) autoSignDarwinBinariesHook;
|
||||||
|
@ -33551,7 +33545,7 @@ with pkgs;
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
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 { };
|
quorum = callPackage ../applications/blockchains/quorum { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue