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.

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

Update Bitcoin and its MiniUPnPc dependency #44214

Merged
merged 2 commits into from Aug 1, 2018
Merged

Conversation

roconnor
Copy link
Contributor

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: bitcoin, miniupnpc_2

Partial log (click to expand)

shrinking /nix/store/8xmyqlfb9c90nd6xk9yb8zmh87vwspci-bitcoin-0.16.2/bin/bitcoind
shrinking /nix/store/8xmyqlfb9c90nd6xk9yb8zmh87vwspci-bitcoin-0.16.2/bin/bitcoin-tx
gzipping man pages under /nix/store/8xmyqlfb9c90nd6xk9yb8zmh87vwspci-bitcoin-0.16.2/share/man/
strip is /nix/store/1hi76hr87bd1y1q1qjk0lv8nmcjip1c8-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/8xmyqlfb9c90nd6xk9yb8zmh87vwspci-bitcoin-0.16.2/lib  /nix/store/8xmyqlfb9c90nd6xk9yb8zmh87vwspci-bitcoin-0.16.2/bin
patching script interpreter paths in /nix/store/8xmyqlfb9c90nd6xk9yb8zmh87vwspci-bitcoin-0.16.2
checking for references to /build in /nix/store/8xmyqlfb9c90nd6xk9yb8zmh87vwspci-bitcoin-0.16.2...
postPatchMkspecs
/nix/store/8xmyqlfb9c90nd6xk9yb8zmh87vwspci-bitcoin-0.16.2
/nix/store/5zx8dghhhg3yy0i25wjc8dzji6c1s8dj-miniupnpc-2.0.20180203

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: bitcoin, miniupnpc_2

Partial log (click to expand)

  CXX      test/test_bitcoin-coins_tests.o
  CXX      test/test_bitcoin-compress_tests.o
  CXX      test/test_bitcoin-crypto_tests.o
  CXX      test/test_bitcoin-cuckoocache_tests.o
  CXX      test/test_bitcoin-DoS_tests.o
  CXX      test/test_bitcoin-getarg_tests.o
  CXX      test/test_bitcoin-hash_tests.o
  CXX      test/test_bitcoin-key_tests.o
building of '/nix/store/91l2bjdirpflxyvszp6p6sbh2lw2m92h-bitcoin-0.16.2.drv' timed out after 3600 seconds
error: build of '/nix/store/91l2bjdirpflxyvszp6p6sbh2lw2m92h-bitcoin-0.16.2.drv' failed


src = fetchurl {
urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
sha256 = "1zkqp93yircd3pbxczxfnibkpq0sgcv5r7wg6d196b9pwgr9zd39";
sha256 = "1n07qykx5hc0ph8fwn7hfrbsrjv19fdzvs5h0nysq4wfgn5wa40r";
Copy link
Contributor

Choose a reason for hiding this comment

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

Verified this is the hash signed by the bitcoin release key

@@ -27,8 +27,8 @@ let
};
in {
miniupnpc_2 = generic {
version = "2.0.20171212";
sha256 = "0za7pr6hrr3ajkifirhhxfn3hlhl06f622g8hnj5h8y18sp3bwff";
version = "2.0.20180203";
Copy link
Contributor

Choose a reason for hiding this comment

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

any reason this version in particular ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right, I should have written about this. I'm being somewhat conservative here. This isn't the latest version of miniupnpc; however it is the version of miniupnpc that Bitcoin Core currently ships with (see https://github.com/bitcoin/bitcoin/blob/master/doc/dependencies.md). I'm not opposed to moving to the latest, but this was the minimum version bump that is needed to bring it inline with what Bitcoin Core is using.

Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@Mic92 Mic92 merged commit 7ceaaa6 into NixOS:master Aug 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants