Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

miniupnpc: 2.2.7 -> 2.2.8, again #326402

Merged
merged 39 commits into from
Jul 12, 2024
Merged

miniupnpc: 2.2.7 -> 2.2.8, again #326402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
4b9186a
Reapply "miniupnpc: 2.2.7 -> 2.2.8 , support static build"
emilazy Jul 11, 2024
b0ee42d
transmission_4: fix build error with our miniupnp
doronbehar Jul 11, 2024
579e16b
transmission_3: add patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
314f169
bitcoin: add upstream patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
37087ef
bitcoin-abc: add upstream patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
2257420
i2pd: add upstream patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
2bf72c4
sunshine: add upstream patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
72446c1
flycast: add upstream patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
58b9ac8
bitcoind-knots: add upstream patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
416aae7
retroshare: 0.6.6 -> 0.6.7.2
emilazy Jul 11, 2024
edc7668
retroshare: add upstream patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
0abdd64
namecoind: add upstream patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
c9ba793
groestlcoind: add upstream patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
2e46cc8
eiskaltdcpp: add upstream patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
77fbc57
litecoin: add patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
0539f86
monero-cli: build with Ninja
emilazy Jul 11, 2024
497259f
monero-cli: add patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
f96b9b9
haven-cli: build with Ninja
emilazy Jul 11, 2024
5a149da
haven-cli: use patches from monero-cli
emilazy Jul 11, 2024
de9db75
alephone: add patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
b9f0aa8
zeroad: add patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
7e44344
yaup: add patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
c5ff204
dante: add patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
ca39d29
chiaki4deck: add patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
9511ce9
elements: add patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
fcf6c25
particl-core: add patch for miniupnpc 2.2.8
emilazy Jul 11, 2024
defe4ae
gridcoin-research: 5.4.8.0 -> 5.4.8.0-hotfix-1
emilazy Jul 11, 2024
38d971a
pshs: move to `pkgs/by-name`
emilazy Jul 11, 2024
f5b70e5
pshs: format with `nixfmt-rfc-style`
emilazy Jul 11, 2024
5bc8c69
pshs: modernize
emilazy Jul 11, 2024
4d9b599
pshs: support all Unix platforms
emilazy Jul 11, 2024
f67cebe
pshs: 0.3.4 -> 0.4.3
emilazy Jul 11, 2024
953b05c
qodem: move to `pkgs/by-name`
emilazy Jul 11, 2024
956487c
qodem: format with `nixfmt-rfc-style`
emilazy Jul 11, 2024
b78f96a
qodem: modernize
emilazy Jul 11, 2024
8dd4be4
qodem: fix build on Darwin
emilazy Jul 11, 2024
187349b
qodem: 1.0.1 -> 1.0.1-unstable-2022-02-12
emilazy Jul 11, 2024
6875020
qodem: add patches
emilazy Jul 11, 2024
4a46bb9
masari: drop
emilazy Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pkgs/applications/blockchains/bitcoin-abc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, stdenv
, mkDerivation
, fetchFromGitHub
, fetchpatch2
, pkg-config
, cmake
, openssl
Expand Down Expand Up @@ -34,6 +35,14 @@ mkDerivation rec {
hash = "sha256-+9uBmmdQ/shWYnJ7tM+Y8OgqYcQHHI2qeMw2tl1lE+w=";
};

patches = [
# upnp: add compatibility for miniupnpc 2.2.8
(fetchpatch2 {
url = "https://github.com/Bitcoin-ABC/bitcoin-abc/commit/5678070f182124a1a8c7c60873d1877094be76ab.patch?full_index=1";
hash = "sha256-QC7TlWepVxQuIZVTbGtQy+HmmXP8PWNhJWdVYudJvmI=";
})
];

nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [
openssl
Expand Down
9 changes: 9 additions & 0 deletions pkgs/applications/blockchains/bitcoin-knots/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch2
, autoreconfHook
, pkg-config
, util-linux
Expand Down Expand Up @@ -32,6 +33,14 @@ stdenv.mkDerivation rec {
hash = "sha256-PqpePDna2gpCzF2K43N4h6cV5Y9w/e5ZcUvaNEaFaIk=";
};

patches = [
# upnp: add compatibility for miniupnpc 2.2.8
(fetchpatch2 {
url = "https://github.com/bitcoinknots/bitcoin/commit/643014424359a4783cf9c73bee3346ac2f04e713.patch?full_index=1";
hash = "sha256-FdLoNH3+ZZTbqrwRvhbAeJuGz4SgnIvoWUBzRxjfzs8=";
})
];

nativeBuildInputs =
[ autoreconfHook pkg-config ]
++ lib.optionals stdenv.isLinux [ util-linux ]
Expand Down
9 changes: 9 additions & 0 deletions pkgs/applications/blockchains/bitcoin/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch2
, autoreconfHook
, pkg-config
, installShellFiles
Expand Down Expand Up @@ -43,6 +44,14 @@ stdenv.mkDerivation rec {
sha256 = "0c1051fd921b8fae912f5c2dfd86b085ab45baa05cd7be4585b10b4d1818f3da";
};

patches = [
# upnp: fix build with miniupnpc 2.2.8
(fetchpatch2 {
url = "https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1";
hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M=";
})
];

nativeBuildInputs =
[ autoreconfHook pkg-config installShellFiles ]
++ lib.optionals stdenv.isLinux [ util-linux ]
Expand Down
9 changes: 9 additions & 0 deletions pkgs/applications/blockchains/elements/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch2
, autoreconfHook
, pkg-config
, util-linux
Expand Down Expand Up @@ -33,6 +34,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-qHtSgfZGZ4Beu5fsJAOZm8ejj7wfHBbOS6WAjOrCuw4=";
};

patches = [
# upnp: fix build with miniupnpc 2.2.8
(fetchpatch2 {
url = "https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1";
hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M=";
})
];

nativeBuildInputs =
[ autoreconfHook pkg-config ]
++ lib.optionals stdenv.isLinux [ util-linux ]
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/blockchains/gridcoin-research/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@

stdenv.mkDerivation rec {
pname = "gridcoin-research";
version = "5.4.8.0";
version = "5.4.8.0-hotfix-1";

src = fetchFromGitHub {
owner = "gridcoin-community";
repo = "Gridcoin-Research";
rev = "${version}";
sha256 = "sha256-HZirzXkqM2aep+wq8k2UCFWHPtN0sBZXjamgt7RYPBo=";
hash = "sha256-e58GJNiZq4LP/HTeveTQD6APeTvUbhUTwMwhU+PiVc0=";
};

nativeBuildInputs = [
Expand Down
9 changes: 9 additions & 0 deletions pkgs/applications/blockchains/groestlcoin/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, stdenv
, fetchurl
, fetchFromGitHub
, fetchpatch2
, autoreconfHook
, pkg-config
, installShellFiles
Expand Down Expand Up @@ -41,6 +42,14 @@ stdenv.mkDerivation rec {
sha256 = "0f6vi2k5xvjrhiazfjcd4aj246dfcg51xsnqb9wdjl41cg0ckwmf";
};

patches = [
# upnp: add compatibility for miniupnpc 2.2.8
(fetchpatch2 {
url = "https://github.com/Groestlcoin/groestlcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1";
hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M=";
})
];

nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ]
++ lib.optionals stdenv.isLinux [ util-linux ]
++ lib.optionals stdenv.isDarwin [ hexdump ]
Expand Down
9 changes: 4 additions & 5 deletions pkgs/applications/blockchains/haven-cli/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config
, boost, miniupnpc, openssl, unbound
, zeromq, pcsclite, readline, libsodium, hidapi
, randomx, rapidjson, easyloggingpp
, CoreData, IOKit, PCSC
, trezorSupport ? true, libusb1, protobuf, python3
, monero-cli
}:

stdenv.mkDerivation rec {
Expand All @@ -18,9 +19,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};

patches = [
./use-system-libraries.patch
];
inherit (monero-cli) patches;

postPatch = ''
# remove vendored libraries
Expand All @@ -29,7 +28,7 @@ stdenv.mkDerivation rec {
cp -r . $source
'';

nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake ninja pkg-config ];

buildInputs = [
boost miniupnpc openssl unbound
Expand Down
94 changes: 0 additions & 94 deletions pkgs/applications/blockchains/haven-cli/use-system-libraries.patch
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion pkgs/applications/blockchains/litecoin/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch
{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, fetchpatch2
, pkg-config, autoreconfHook
, openssl, db48, boost, zlib, miniupnpc
, glib, protobuf, util-linux, qrencode
Expand Down Expand Up @@ -34,6 +34,13 @@ mkDerivation rec {
url = "https://github.com/litecoin-project/litecoin/commit/6d1adb19aa79a8e8e140582759515bbd76816aa0.patch";
hash = "sha256-1y4Iz2plMw5HMAjl9x50QQpYrYaUd2WKrrAcUnQmlBY=";
})

# net: add compatibility for miniupnpc 2.2.8
# https://github.com/litecoin-project/litecoin/pull/971
(fetchpatch2 {
url = "https://github.com/litecoin-project/litecoin/commit/5dddffa3e1bbcc7a3e6963b4860ba2d675ca847b.patch?full_index=1";
hash = "sha256-F5GcL1RM91l04WrS3qYlV5zEcwyXrcRdmLLCqu1Hop0=";
})
];

nativeBuildInputs = [ pkg-config autoreconfHook ];
Expand Down
39 changes: 0 additions & 39 deletions pkgs/applications/blockchains/masari/default.nix
View file
Open in desktop

This file was deleted.

26 changes: 24 additions & 2 deletions pkgs/applications/blockchains/monero-cli/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
{ lib, stdenv, fetchFromGitHub, fetchpatch2, cmake, ninja, pkg-config
, boost, miniupnpc, openssl, unbound
, zeromq, pcsclite, readline, libsodium, hidapi
, randomx, rapidjson
Expand Down Expand Up @@ -35,6 +35,28 @@ stdenv.mkDerivation rec {
};

patches = [
# cmake: remove unused/extera cmake/FindMiniupnpc.cmake and only rely on external/miniupnpc
# https://github.com/monero-project/monero/pull/9366
(fetchpatch2 {
url = "https://github.com/monero-project/monero/commit/5074a543a49f7e23fb39b6462fd4c4c9741c3693.patch?full_index=1";
hash = "sha256-dS2hhEU6m2of0ULlsf+/tZMHUmq3vGGXJPGHvtnpQnY=";
})

# cmake: add different parameters to add_monero_library.
# https://github.com/monero-project/monero/pull/9367
(fetchpatch2 {
url = "https://github.com/monero-project/monero/commit/b91ead90254ac6d6daf908f689c38e372a44c615.patch?full_index=1";
hash = "sha256-DL2YqkvEONbeEDqLOAo2eSF5JF5gOzKcLKeNlUXBY1w=";
})

# external: update miniupnpc to 2.2.8
# https://github.com/monero-project/monero/pull/9367
(fetchpatch2 {
url = "https://github.com/monero-project/monero/commit/d81da086ec5088a04b3f7b34831e72910300e2f7.patch?full_index=1";
hash = "sha256-ZJGiDMk5DMmEXwzoUYPC+DIoebluFh54kMQtQU78ckI=";
excludes = [ "external/miniupnp" ];
})

./use-system-libraries.patch
Comment on lines +59 to 60
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit weird to me how these external patches don't allow us to not have also a local patch... However this shouldn't block this PR.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previous anti‐vendoring patch was actually not fully functional in terms of specifying the header locations. The upstream PRs that fix miniupnpc 2.2.8 also forced the vendoring even harder. So since it’ll need dealing with anyway on the next version, I just fixed the anti‐vendoring stuff and reduced its size in the process.

];

Expand All @@ -47,7 +69,7 @@ stdenv.mkDerivation rec {
cp -r . $source
'';

nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake ninja pkg-config ];

buildInputs = [
boost miniupnpc openssl unbound
Expand Down
Loading