diff options
Diffstat (limited to 'pkgs/applications/blockchains')
-rw-r--r-- | pkgs/applications/blockchains/bitcoin-abc/default.nix (renamed from pkgs/applications/blockchains/bitcoin-abc.nix) | 52 | ||||
-rw-r--r-- | pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch (renamed from pkgs/applications/blockchains/fix-bitcoin-qt-build.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/bitcoin-classic/default.nix (renamed from pkgs/applications/blockchains/bitcoin-classic.nix) | 50 | ||||
-rw-r--r-- | pkgs/applications/blockchains/bitcoin-gold/default.nix (renamed from pkgs/applications/blockchains/bitcoin-gold.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/bitcoin-knots/default.nix (renamed from pkgs/applications/blockchains/bitcoin-knots.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/bitcoin-unlimited/default.nix (renamed from pkgs/applications/blockchains/bitcoin-unlimited.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/bitcoin/default.nix (renamed from pkgs/applications/blockchains/bitcoin.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/chia-plotter/default.nix | 65 | ||||
-rw-r--r-- | pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch | 50 | ||||
-rw-r--r-- | pkgs/applications/blockchains/chia/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/blockchains/clightning/default.nix (renamed from pkgs/applications/blockchains/clightning.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/crypto-org-wallet/default.nix (renamed from pkgs/applications/blockchains/crypto-org-wallet.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/dashpay/default.nix (renamed from pkgs/applications/blockchains/dashpay.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/dcrd/default.nix (renamed from pkgs/applications/blockchains/dcrd.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/dcrwallet/default.nix (renamed from pkgs/applications/blockchains/dcrwallet.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/dero/default.nix (renamed from pkgs/applications/blockchains/dero.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/digibyte/default.nix (renamed from pkgs/applications/blockchains/digibyte.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/dogecoin/default.nix (renamed from pkgs/applications/blockchains/dogecoin.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/eclair/default.nix (renamed from pkgs/applications/blockchains/eclair.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/electrs/default.nix (renamed from pkgs/applications/blockchains/electrs.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/elements/default.nix (renamed from pkgs/applications/blockchains/elements.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/go-ethereum/default.nix (renamed from pkgs/applications/blockchains/go-ethereum.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/ledger-live-desktop/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/blockchains/litecoin/default.nix (renamed from pkgs/applications/blockchains/litecoin.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/lnd/default.nix (renamed from pkgs/applications/blockchains/lnd.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/lndmanage/default.nix (renamed from pkgs/applications/blockchains/lndmanage.nix) | 4 | ||||
-rw-r--r-- | pkgs/applications/blockchains/masari/default.nix (renamed from pkgs/applications/blockchains/masari.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/namecoin/default.nix (renamed from pkgs/applications/blockchains/namecoin.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/nano-wallet/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/blockchains/particl-core/default.nix (renamed from pkgs/applications/blockchains/particl/particl-core.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/pivx/default.nix (renamed from pkgs/applications/blockchains/pivx.nix) | 53 | ||||
-rw-r--r-- | pkgs/applications/blockchains/quorum/default.nix (renamed from pkgs/applications/blockchains/quorum.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/stellar-core/default.nix (renamed from pkgs/applications/blockchains/stellar-core.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/sumokoin/default.nix (renamed from pkgs/applications/blockchains/sumokoin.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/tessera/default.nix (renamed from pkgs/applications/blockchains/tessera.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/turbo-geth/default.nix (renamed from pkgs/applications/blockchains/turbo-geth.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/vertcoin/default.nix (renamed from pkgs/applications/blockchains/vertcoin.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/blockchains/wownero/default.nix (renamed from pkgs/applications/blockchains/wownero.nix) | 0 |
38 files changed, 235 insertions, 52 deletions
diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 446aafab8ce..6f1734bbc13 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -1,12 +1,28 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, cmake, openssl, db53, boost -, zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent -, withGui, python3, jemalloc, zeromq4 }: - -with lib; +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, pkg-config +, cmake +, openssl +, db53 +, boost +, zlib +, miniupnpc +, qtbase ? null +, qttools ? null +, util-linux +, protobuf +, qrencode +, libevent +, withGui +, python3 +, jemalloc +, zeromq4 +}: mkDerivation rec { - - name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; + pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; version = "0.21.13"; src = fetchFromGitHub { @@ -19,11 +35,21 @@ mkDerivation rec { patches = [ ./fix-bitcoin-qt-build.patch ]; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4 - miniupnpc util-linux protobuf libevent ] - ++ optionals withGui [ qtbase qttools qrencode ]; + buildInputs = [ + openssl + db53 + boost + zlib + python3 + jemalloc + zeromq4 + miniupnpc + util-linux + protobuf + libevent + ] ++ lib.optionals withGui [ qtbase qttools qrencode ]; - cmakeFlags = optionals (!withGui) [ + cmakeFlags = lib.optionals (!withGui) [ "-DBUILD_BITCOIN_QT=OFF" ]; @@ -32,9 +58,9 @@ mkDerivation rec { find ./. -type f -iname "*.sh" -exec chmod +x {} \; ''; - meta = { + meta = with lib; { description = "Peer-to-peer electronic cash system (Cash client)"; - longDescription= '' + longDescription = '' Bitcoin ABC is the name of open source software which enables the use of Bitcoin. It is designed to facilite a hard fork to increase Bitcoin's block size limit. "ABC" stands for "Adjustable Blocksize Cap". diff --git a/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch b/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch index c49bbc43251..c49bbc43251 100644 --- a/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch +++ b/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic/default.nix index f578313323c..533e3c7dca6 100644 --- a/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/pkgs/applications/blockchains/bitcoin-classic/default.nix @@ -1,12 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qtbase ? null, qttools ? null, util-linux, protobuf, qrencode, libevent -, withGui }: - -with lib; +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, openssl +, db48 +, boost +, zlib +, miniupnpc +, qtbase ? null +, qttools ? null +, util-linux +, protobuf +, qrencode +, libevent +, withGui +}: stdenv.mkDerivation rec { - - name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version; + pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-classic"; version = "1.3.8uahf"; src = fetchFromGitHub { @@ -17,22 +29,30 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ openssl db48 boost zlib - miniupnpc util-linux protobuf libevent ] - ++ optionals withGui [ qtbase qttools qrencode ]; + buildInputs = [ + openssl + db48 + boost + zlib + miniupnpc + util-linux + protobuf + libevent + ] ++ lib.optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt5" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" - ]; + ++ lib.optionals withGui [ + "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; enableParallelBuilding = true; dontWrapQtApps = true; - meta = { + meta = with lib; { description = "Peer-to-peer electronic cash system (Classic client)"; - longDescription= '' + longDescription = '' Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold/default.nix index 5d6775f729a..5d6775f729a 100644 --- a/pkgs/applications/blockchains/bitcoin-gold.nix +++ b/pkgs/applications/blockchains/bitcoin-gold/default.nix diff --git a/pkgs/applications/blockchains/bitcoin-knots.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index eea836ac62d..eea836ac62d 100644 --- a/pkgs/applications/blockchains/bitcoin-knots.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix index f1825b0cbda..f1825b0cbda 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 00727d294df..00727d294df 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix diff --git a/pkgs/applications/blockchains/chia-plotter/default.nix b/pkgs/applications/blockchains/chia-plotter/default.nix new file mode 100644 index 00000000000..39f2e3cb0ed --- /dev/null +++ b/pkgs/applications/blockchains/chia-plotter/default.nix @@ -0,0 +1,65 @@ +{ lib +, fetchFromGitHub +, stdenv +, libsodium +, cmake +, substituteAll +, pythonPackages +}: + +stdenv.mkDerivation { + pname = "chia-plotter"; + version = "unstable-2021-07-12"; + + src = fetchFromGitHub { + owner = "madMAx43v3r"; + repo = "chia-plotter"; + rev = "974d6e5f1440f68c48492122ca33828a98864dfc"; + sha256 = "0dliswvqmi3wq9w8jp0sb0z74n5k37608sig6r60z206g2bwhjja"; + fetchSubmodules = true; + }; + + patches = [ + # prevent CMake from trying to get libraries on the Internet + (substituteAll { + src = ./dont_fetch_dependencies.patch; + pybind11_src = pythonPackages.pybind11.src; + relic_src = fetchFromGitHub { + owner = "relic-toolkit"; + repo = "relic"; + rev = "1885ae3b681c423c72b65ce1fe70910142cf941c"; + hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0="; + }; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libsodium ]; + + # These flags come from the upstream build script: + # https://github.com/madMAx43v3r/chia-plotter/blob/974d6e5f1440f68c48492122ca33828a98864dfc/make_devel.sh#L7 + CXXFLAGS = "-O3 -fmax-errors=1"; + cmakeFlags = [ + "-DARITH=easy" + "-DBUILD_BLS_PYTHON_BINDINGS=false" + "-DBUILD_BLS_TESTS=false" + "-DBUILD_BLS_BENCHMARKS=false" + ]; + + installPhase = '' + runHook preInstall + + install -D -m 755 chia_plot $out/bin/chia_plot + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/madMAx43v3r/chia-plotter"; + description = "New implementation of a chia plotter which is designed as a processing pipeline"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ ilyakooo0 ]; + }; +} diff --git a/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch b/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch new file mode 100644 index 00000000000..05486473eef --- /dev/null +++ b/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch @@ -0,0 +1,50 @@ +diff --git a/lib/bls-signatures/python-bindings/CMakeLists.txt b/lib/bls-signatures/python-bindings/CMakeLists.txt +index 255e3bb..5f99c3a 100644 +--- a/lib/bls-signatures/python-bindings/CMakeLists.txt ++++ b/lib/bls-signatures/python-bindings/CMakeLists.txt +@@ -6,8 +6,7 @@ include(FetchContent) + + FetchContent_Declare( + pybind11 +- GIT_REPOSITORY https://github.com/pybind/pybind11.git +- GIT_TAG v2.6.2 ++ SOURCE_DIR @pybind11_src@ + ) + FetchContent_MakeAvailable(pybind11 relic) + +diff --git a/lib/bls-signatures/src/CMakeLists.txt b/lib/bls-signatures/src/CMakeLists.txt +index b762b5d..e06073b 100644 +--- a/lib/bls-signatures/src/CMakeLists.txt ++++ b/lib/bls-signatures/src/CMakeLists.txt +@@ -4,18 +4,11 @@ set (CMAKE_CXX_STANDARD 17) + # CMake 3.14+ + include(FetchContent) + +-if (DEFINED ENV{RELIC_MAIN}) +- set(RELIC_GIT_TAG "origin/main") +-else () +- set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c") +-endif () +- + message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") + + FetchContent_Declare( + relic +- GIT_REPOSITORY https://github.com/relic-toolkit/relic.git +- GIT_TAG ${RELIC_GIT_TAG} ++ SOURCE_DIR @relic_src@ + ) + FetchContent_MakeAvailable(relic) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 970ec74..948441a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,6 +38,7 @@ include_directories( + ${BLAKE3_PATH} + ${CMAKE_BINARY_DIR}/_deps/relic-src/include + ${CMAKE_BINARY_DIR}/_deps/relic-build/include ++ @relic_src@/include + ) + + IF (WIN32) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 2c8e986fa86..d0ecdc4f72a 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -72,6 +72,7 @@ python3Packages.buildPythonApplication rec { --replace "click==7.1.2" "click>=7.1.2" \ --replace "clvm_rs==0.1.8" "clvm_rs>=0.1.8" \ --replace "clvm==0.9.7" "clvm>=0.9.7" \ + --replace "bitstring==3.1.7" "bitstring>=3.1.9" \ ''; preCheck = '' diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning/default.nix index 44ed4d1541c..44ed4d1541c 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning/default.nix diff --git a/pkgs/applications/blockchains/crypto-org-wallet.nix b/pkgs/applications/blockchains/crypto-org-wallet/default.nix index 7b0a895f4a1..7b0a895f4a1 100644 --- a/pkgs/applications/blockchains/crypto-org-wallet.nix +++ b/pkgs/applications/blockchains/crypto-org-wallet/default.nix diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay/default.nix index ca1dd13e425..ca1dd13e425 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay/default.nix diff --git a/pkgs/applications/blockchains/dcrd.nix b/pkgs/applications/blockchains/dcrd/default.nix index e959eca48ae..e959eca48ae 100644 --- a/pkgs/applications/blockchains/dcrd.nix +++ b/pkgs/applications/blockchains/dcrd/default.nix diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet/default.nix index 2266a1e4c26..2266a1e4c26 100644 --- a/pkgs/applications/blockchains/dcrwallet.nix +++ b/pkgs/applications/blockchains/dcrwallet/default.nix diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero/default.nix index 6b15cbd0a16..6b15cbd0a16 100644 --- a/pkgs/applications/blockchains/dero.nix +++ b/pkgs/applications/blockchains/dero/default.nix diff --git a/pkgs/applications/blockchains/digibyte.nix b/pkgs/applications/blockchains/digibyte/default.nix index acf0b355e64..acf0b355e64 100644 --- a/pkgs/applications/blockchains/digibyte.nix +++ b/pkgs/applications/blockchains/digibyte/default.nix diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin/default.nix index 9985113b08a..9985113b08a 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin/default.nix diff --git a/pkgs/applications/blockchains/eclair.nix b/pkgs/applications/blockchains/eclair/default.nix index 7b74512a388..7b74512a388 100644 --- a/pkgs/applications/blockchains/eclair.nix +++ b/pkgs/applications/blockchains/eclair/default.nix diff --git a/pkgs/applications/blockchains/electrs.nix b/pkgs/applications/blockchains/electrs/default.nix index cf2f4d3d47e..cf2f4d3d47e 100644 --- a/pkgs/applications/blockchains/electrs.nix +++ b/pkgs/applications/blockchains/electrs/default.nix diff --git a/pkgs/applications/blockchains/elements.nix b/pkgs/applications/blockchains/elements/default.nix index c44f2078dae..c44f2078dae 100644 --- a/pkgs/applications/blockchains/elements.nix +++ b/pkgs/applications/blockchains/elements/default.nix diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 28a7b22a24f..28a7b22a24f 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 1c6c41a0e72..6e97c51afce 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.30.0"; + version = "2.31.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "0xh28m3slzg6bp0fm183m62ydzqkvj384j4dwsfalgz4ndwvy595"; + sha256 = "0cxf4i58l0kg9c13j7mf0w5ijrkkf9z1375vn6xghd0r8g5hvws5"; }; appimageContents = appimageTools.extractType2 { @@ -30,7 +30,7 @@ in appimageTools.wrapType2 rec { description = "Wallet app for Ledger Nano S and Ledger Blue"; homepage = "https://www.ledger.com/live"; license = licenses.mit; - maintainers = with maintainers; [ thedavidmeister nyanloutre RaghavSood th0rgal ]; + maintainers = with maintainers; [ andresilva thedavidmeister nyanloutre RaghavSood th0rgal ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin/default.nix index c80ef342c75..c80ef342c75 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin/default.nix diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd/default.nix index c956bca9a1a..c956bca9a1a 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd/default.nix diff --git a/pkgs/applications/blockchains/lndmanage.nix b/pkgs/applications/blockchains/lndmanage/default.nix index 56db469ff45..3c7e28d831e 100644 --- a/pkgs/applications/blockchains/lndmanage.nix +++ b/pkgs/applications/blockchains/lndmanage/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "lndmanage"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "bitromortac"; repo = pname; rev = "v${version}"; - sha256 = "19sqf7cjslwpfzcdbyq182dx7gnn9hii77sahbnh88v69qxgwzvb"; + sha256 = "1p73wdxv3fca2ga4nqpjk5lig7bj2v230lh8niw490p5y7hhnggl"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/blockchains/masari.nix b/pkgs/applications/blockchains/masari/default.nix index bf995da36af..bf995da36af 100644 --- a/pkgs/applications/blockchains/masari.nix +++ b/pkgs/applications/blockchains/masari/default.nix diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin/default.nix index dccee1dc056..dccee1dc056 100644 --- a/pkgs/applications/blockchains/namecoin.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 8e8d3da92be..e13a77c7d24 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL -, qtbase, python }: +, qtbase, python3 }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = let options = { - PYTHON_EXECUTABLE = "${python}/bin/python"; + PYTHON_EXECUTABLE = "${python3.interpreter}"; NANO_SHARED_BOOST = "ON"; BOOST_ROOT = boost; RAIBLOCKS_GUI = "ON"; @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ boost libGL qtbase ]; + strictDeps = true; + buildPhase = '' runHook preBuild make nano_wallet diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl-core/default.nix index 99bc49e8db3..99bc49e8db3 100644 --- a/pkgs/applications/blockchains/particl/particl-core.nix +++ b/pkgs/applications/blockchains/particl-core/default.nix diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx/default.nix index 58986a10676..fd562edf93f 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx/default.nix @@ -1,38 +1,57 @@ -{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, wrapQtAppsHook ? null -, openssl, db48, boost, zlib, miniupnpc, gmp -, qrencode, glib, protobuf, yasm, libevent -, util-linux, qtbase ? null, qttools ? null +{ fetchFromGitHub +, lib +, stdenv +, pkg-config +, autoreconfHook +, wrapQtAppsHook +, openssl +, db48 +, boost +, zlib +, miniupnpc +, gmp +, qrencode +, glib +, protobuf +, yasm +, libevent +, util-linux +, qtbase +, qttools , enableUpnp ? false , disableWallet ? false , disableDaemon ? false -, withGui ? false }: +, withGui ? false +}: -with lib; stdenv.mkDerivation rec { - name = "pivx-${version}"; + pname = "pivx"; version = "4.1.1"; src = fetchFromGitHub { owner = "PIVX-Project"; - repo= "PIVX"; + repo = "PIVX"; rev = "v${version}"; sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy"; }; - nativeBuildInputs = [ pkg-config autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; + buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ] - ++ optionals withGui [ qtbase qttools qrencode ]; + ++ lib.optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optional enableUpnp "--enable-upnp-default" - ++ optional disableWallet "--disable-wallet" - ++ optional disableDaemon "--disable-daemon" - ++ optionals withGui [ "--with-gui=yes" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" - ]; + ++ lib.optional enableUpnp "--enable-upnp-default" + ++ lib.optional disableWallet "--disable-wallet" + ++ lib.optional disableDaemon "--disable-daemon" + ++ lib.optionals withGui [ + "--with-gui=yes" + "--with-qt-bindir=${lib.getDev qtbase}/bin:${lib.getDev qttools}/bin" + ]; enableParallelBuilding = true; - doChecks = true; + doCheck = true; postBuild = '' mkdir -p $out/share/applications $out/share/icons cp contrib/debian/pivx-qt.desktop $out/share/applications/ diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum/default.nix index 1424ddc9516..1424ddc9516 100644 --- a/pkgs/applications/blockchains/quorum.nix +++ b/pkgs/applications/blockchains/quorum/default.nix diff --git a/pkgs/applications/blockchains/stellar-core.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 6ecc4e241cb..6ecc4e241cb 100644 --- a/pkgs/applications/blockchains/stellar-core.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix diff --git a/pkgs/applications/blockchains/sumokoin.nix b/pkgs/applications/blockchains/sumokoin/default.nix index ee817b58195..ee817b58195 100644 --- a/pkgs/applications/blockchains/sumokoin.nix +++ b/pkgs/applications/blockchains/sumokoin/default.nix diff --git a/pkgs/applications/blockchains/tessera.nix b/pkgs/applications/blockchains/tessera/default.nix index 5b139252553..5b139252553 100644 --- a/pkgs/applications/blockchains/tessera.nix +++ b/pkgs/applications/blockchains/tessera/default.nix diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth/default.nix index b1548212a69..b1548212a69 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth/default.nix diff --git a/pkgs/applications/blockchains/vertcoin.nix b/pkgs/applications/blockchains/vertcoin/default.nix index acb02298e11..acb02298e11 100644 --- a/pkgs/applications/blockchains/vertcoin.nix +++ b/pkgs/applications/blockchains/vertcoin/default.nix diff --git a/pkgs/applications/blockchains/wownero.nix b/pkgs/applications/blockchains/wownero/default.nix index bc020de8be4..bc020de8be4 100644 --- a/pkgs/applications/blockchains/wownero.nix +++ b/pkgs/applications/blockchains/wownero/default.nix |