diff options
| author | Russell O'Connor <roconnor@theorem.ca> | 2017-11-13 15:30:24 -0500 |
|---|---|---|
| committer | Russell O'Connor <roconnor@theorem.ca> | 2017-11-13 15:39:56 -0500 |
| commit | 4173e8695a8c10e9a26b48c538359f5d87473337 (patch) | |
| tree | 40c80fb58581041e0ac8e01b6c4e38d4a08adafe /pkgs/applications | |
| parent | f575062f9764b02fb04609e0afb0403e48435d7e (diff) | |
| download | nixpkgs-4173e8695a8c10e9a26b48c538359f5d87473337.tar nixpkgs-4173e8695a8c10e9a26b48c538359f5d87473337.tar.gz nixpkgs-4173e8695a8c10e9a26b48c538359f5d87473337.tar.bz2 nixpkgs-4173e8695a8c10e9a26b48c538359f5d87473337.tar.lz nixpkgs-4173e8695a8c10e9a26b48c538359f5d87473337.tar.xz nixpkgs-4173e8695a8c10e9a26b48c538359f5d87473337.tar.zst nixpkgs-4173e8695a8c10e9a26b48c538359f5d87473337.zip | |
bitcoin: 0.15.0.1 -> 0.15.1
I have also updated the dependencies for bitcoin: * qt4 is updated to qt5 * miniupnpc 1 is updated to miniupnpc 2 * zeromq dependency has been added to enable ZeroMQ support.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/altcoins/bitcoin.nix | 20 | ||||
| -rw-r--r-- | pkgs/applications/altcoins/default.nix | 6 |
2 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 23c9ffe3a09..63c45b3ba07 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq +, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.15.0.1"; + version = "0.15.1"; src = fetchurl { - url = "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"; - sha256 = "16si3skhm6jhw1pkniv2b9y1kkdhjmhj392palphir0qc1srwzmm"; + 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"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db48 boost zlib + buildInputs = [ openssl db48 boost zlib zeromq miniupnpc protobuf libevent] ++ optionals stdenv.isLinux [ utillinux ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; + ++ optionals withGui [ "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; meta = { description = "Peer-to-peer electronic cash system"; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 1a21efc3232..bccb6a34e8e 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,9 +1,9 @@ -{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }: +{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2 }: rec { - bitcoin = callPackage ./bitcoin.nix { withGui = true; }; - bitcoind = callPackage ./bitcoin.nix { 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; }; |