diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-02 15:19:35 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-02 15:19:35 +0000 |
commit | 4bb17f5860a5fbca48de54bcae15c5b72a7e06ab (patch) | |
tree | be5cb7450ffa23d668c9a386f295cf88f38f182d /pkgs/applications/altcoins | |
parent | 336eb53f727820e5081a48715f040d8db4e3c367 (diff) | |
parent | 1759eec2e923702933cb2b28ea45c7b6ef684209 (diff) | |
download | nixlib-4bb17f5860a5fbca48de54bcae15c5b72a7e06ab.tar nixlib-4bb17f5860a5fbca48de54bcae15c5b72a7e06ab.tar.gz nixlib-4bb17f5860a5fbca48de54bcae15c5b72a7e06ab.tar.bz2 nixlib-4bb17f5860a5fbca48de54bcae15c5b72a7e06ab.tar.lz nixlib-4bb17f5860a5fbca48de54bcae15c5b72a7e06ab.tar.xz nixlib-4bb17f5860a5fbca48de54bcae15c5b72a7e06ab.tar.zst nixlib-4bb17f5860a5fbca48de54bcae15c5b72a7e06ab.zip |
Merge pull request #36121 from roconnor/bitcoin
bitcoin: 0.15.1 -> 0.16.0
Diffstat (limited to 'pkgs/applications/altcoins')
-rw-r--r-- | pkgs/applications/altcoins/bitcoin.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/altcoins/default.nix | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 63c45b3ba07f..0acd616eeaff 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.15.1"; + version = "0.16.0"; 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 = "1d22fgwdcn343kd95lh389hj417zwbmnhi29cij8n7wc0nz2vpil"; + sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec{ homepage = http://www.bitcoin.org/; maintainers = with maintainers; [ roconnor AndersonTorres ]; license = licenses.mit; - platforms = platforms.unix; + # bitcoin needs hexdump to build, which doesn't seem to build on darwin at the moment. + platforms = platforms.linux; }; } diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 37df75ae110e..09cf5a057f50 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,11 +1,11 @@ -{ callPackage, boost155, boost164, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: +{ callPackage, boost155, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: rec { aeon = callPackage ./aeon { }; - bitcoin = libsForQt5.callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = true; }; - bitcoind = callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = false; }; + bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; + bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; }; |