Merge pull request #146916 from prusnak/bitcoin-knots

bitcoin-knots: 0.20.0.knots20200614 -> 22.0.knots20211108

authored by

Pavol Rusnak and committed by
GitHub
b4f2fe59 fdd6f7cc

+75 -28
+68 -26
pkgs/applications/blockchains/bitcoin-knots/default.nix
··· 1 - { lib, stdenv 2 - , fetchFromGitHub 3 - , pkg-config 4 , autoreconfHook 5 - , db5 6 - , openssl 7 , boost 8 , zlib 9 - , miniupnpc 10 - , libevent 11 - , protobuf 12 - , util-linux 13 }: 14 15 stdenv.mkDerivation rec { 16 - pname = "bitcoind-knots"; 17 - version = "0.20.0"; 18 - versionDate = "20200614"; 19 20 - src = fetchFromGitHub { 21 - owner = "bitcoinknots"; 22 - repo = "bitcoin"; 23 - rev = "v${version}.knots${versionDate}"; 24 - sha256 = "0c8k1154kcwz6q2803wx0zigvqaij1fi5akgfqlj3yl57jjw48jj"; 25 }; 26 27 - nativeBuildInputs = [ pkg-config autoreconfHook ]; 28 - buildInputs = [ openssl db5 openssl util-linux 29 - protobuf boost zlib miniupnpc libevent ]; 30 31 - configureFlags = [ "--with-incompatible-bdb" 32 - "--with-boost-libdir=${boost.out}/lib" ]; 33 34 - meta = with lib; { 35 - description = "An enhanced Bitcoin node software"; 36 homepage = "https://bitcoinknots.org/"; 37 license = licenses.mit; 38 - maintainers = [ maintainers.mmahut ]; 39 - platforms = platforms.linux; 40 }; 41 }
··· 1 + { lib 2 + , stdenv 3 + , fetchurl 4 , autoreconfHook 5 + , pkg-config 6 + , util-linux 7 + , hexdump 8 + , autoSignDarwinBinariesHook 9 + , wrapQtAppsHook ? null 10 , boost 11 + , libevent 12 + , miniupnpc 13 + , zeromq 14 , zlib 15 + , db48 16 + , sqlite 17 + , qrencode 18 + , qtbase ? null 19 + , qttools ? null 20 + , python3 21 + , nixosTests 22 + , withGui 23 + , withWallet ? true 24 }: 25 26 + with lib; 27 stdenv.mkDerivation rec { 28 + pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; 29 + version = "22.0.knots20211108"; 30 31 + src = fetchurl { 32 + url = "https://bitcoinknots.org/files/22.x/${version}/guix/bitcoin-${version}.tar.gz"; 33 + sha256 = "04sqbx4sp3bzwbl8z53nz96n3s0590h327ih0mbgyvfvl3b8pj4i"; 34 }; 35 36 + nativeBuildInputs = 37 + [ autoreconfHook pkg-config ] 38 + ++ optionals stdenv.isLinux [ util-linux ] 39 + ++ optionals stdenv.isDarwin [ hexdump ] 40 + ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] 41 + ++ optionals withGui [ wrapQtAppsHook ]; 42 + 43 + buildInputs = [ boost libevent miniupnpc zeromq zlib ] 44 + ++ optionals withWallet [ db48 sqlite ] 45 + ++ optionals withGui [ qrencode qtbase qttools ]; 46 + 47 + configureFlags = [ 48 + "--with-boost-libdir=${boost.out}/lib" 49 + "--disable-bench" 50 + ] ++ optionals (!doCheck) [ 51 + "--disable-tests" 52 + "--disable-gui-tests" 53 + ] ++ optionals (!withWallet) [ 54 + "--disable-wallet" 55 + ] ++ optionals withGui [ 56 + "--with-gui=qt5" 57 + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" 58 + ]; 59 + 60 + checkInputs = [ python3 ]; 61 62 + doCheck = true; 63 + 64 + checkFlags = 65 + [ "LC_ALL=en_US.UTF-8" ] 66 + # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. 67 + # See also https://github.com/NixOS/nixpkgs/issues/24256 68 + ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; 69 + 70 + enableParallelBuilding = true; 71 + 72 + passthru.tests = { 73 + smoke-test = nixosTests.bitcoind-knots; 74 + }; 75 76 + meta = { 77 + description = "A derivative of Bitcoin Core with a collection of improvements"; 78 homepage = "https://bitcoinknots.org/"; 79 + maintainers = with maintainers; [ prusnak mmahut ]; 80 license = licenses.mit; 81 + platforms = platforms.unix; 82 }; 83 }
+1 -1
pkgs/applications/blockchains/bitcoin/default.nix
··· 79 doCheck = true; 80 81 checkFlags = 82 - [ "LC_ALL=C.UTF-8" ] 83 # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. 84 # See also https://github.com/NixOS/nixpkgs/issues/24256 85 ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
··· 79 doCheck = true; 80 81 checkFlags = 82 + [ "LC_ALL=en_US.UTF-8" ] 83 # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. 84 # See also https://github.com/NixOS/nixpkgs/issues/24256 85 ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
+6 -1
pkgs/top-level/all-packages.nix
··· 29566 inherit (darwin) autoSignDarwinBinariesHook; 29567 }; 29568 29569 - bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { miniupnpc = miniupnpc_2; }; 29570 29571 cgminer = callPackage ../applications/blockchains/cgminer { }; 29572
··· 29566 inherit (darwin) autoSignDarwinBinariesHook; 29567 }; 29568 29569 + bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { 29570 + boost = boost17x; 29571 + miniupnpc = miniupnpc_2; 29572 + withGui = false; 29573 + inherit (darwin) autoSignDarwinBinariesHook; 29574 + }; 29575 29576 cgminer = callPackage ../applications/blockchains/cgminer { }; 29577