diff options
Diffstat (limited to 'pkgs/applications/blockchains')
20 files changed, 43 insertions, 54 deletions
diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index 5a09641c70d1..d65889be3ac0 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -7,7 +7,8 @@ let version = "0.12.9.0"; in stdenv.mkDerivation { - name = "aeon-${version}"; + pname = "aeon"; + inherit version; src = fetchFromGitHub { owner = "aeonix"; diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index 481e19c66cdc..b20a6b3e8aa8 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -3,18 +3,20 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "clightning-${version}"; - version = "0.7.1"; + pname = "clightning"; + version = "0.7.2.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "557be34410f27a8d55d9f31a40717a8f5e99829f2bd114c24e7ca1dd5f6b7d85"; + sha256 = "3be716948efc1208b5e6a41e3034e4e4eecc5abbdac769fd1d999a104ac3a2ec"; }; enableParallelBuilding = true; nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which unzip ]; - buildInputs = [ sqlite gmp zlib python3 ]; + buildInputs = + let py3 = python3.withPackages (p: [ p.Mako ]); + in [ sqlite gmp zlib py3 ]; makeFlags = [ "prefix=$(out) VERSION=v${version}" ]; @@ -23,7 +25,10 @@ stdenv.mkDerivation rec { ''; postPatch = '' - patchShebangs tools/generate-wire.py + patchShebangs \ + tools/generate-wire.py \ + tools/update-mocks.sh \ + tools/mockup.sh ''; doCheck = false; diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix index b2f2a457a99d..03dcd6cb54e6 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dashpay-${version}"; + pname = "dashpay"; version = "0.12.2.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/dcrd.nix b/pkgs/applications/blockchains/dcrd.nix index cc3e83befa64..16d39e85da15 100644 --- a/pkgs/applications/blockchains/dcrd.nix +++ b/pkgs/applications/blockchains/dcrd.nix @@ -1,7 +1,7 @@ { stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: buildGoPackage rec { - name = "dcrd-${version}"; + pname = "dcrd"; version = "1.1.2"; rev = "refs/tags/v${version}"; goPackagePath = "github.com/decred/dcrd"; diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix index 8d966684b23c..163ed2615d33 100644 --- a/pkgs/applications/blockchains/dcrwallet.nix +++ b/pkgs/applications/blockchains/dcrwallet.nix @@ -1,7 +1,7 @@ { stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: buildGoPackage rec { - name = "dcrwallet-${version}"; + pname = "dcrwallet"; version = "1.1.2"; rev = "refs/tags/v${version}"; goPackagePath = "github.com/decred/dcrwallet"; diff --git a/pkgs/applications/blockchains/dero.nix b/pkgs/applications/blockchains/dero.nix index 8405ea8f842b..0ab63bb53951 100644 --- a/pkgs/applications/blockchains/dero.nix +++ b/pkgs/applications/blockchains/dero.nix @@ -2,7 +2,7 @@ , lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { - name = "dero-${version}"; + pname = "dero"; version = "0.11.6"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/freicoin.nix b/pkgs/applications/blockchains/freicoin.nix index 664159be2013..6cf84f76f919 100644 --- a/pkgs/applications/blockchains/freicoin.nix +++ b/pkgs/applications/blockchains/freicoin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.8.6-2"; - name = "freicoin-${version}"; + pname = "freicoin"; src = fetchFromGitHub { owner = "freicoin"; diff --git a/pkgs/applications/blockchains/go-ethereum-classic/default.nix b/pkgs/applications/blockchains/go-ethereum-classic/default.nix index 7461e4c376ab..ed8086f742f9 100644 --- a/pkgs/applications/blockchains/go-ethereum-classic/default.nix +++ b/pkgs/applications/blockchains/go-ethereum-classic/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "go-ethereum-classic-${version}"; + pname = "go-ethereum-classic"; version = "4.0.0"; goPackagePath = "github.com/ethereumproject/go-ethereum"; diff --git a/pkgs/applications/blockchains/masari.nix b/pkgs/applications/blockchains/masari.nix index 02a6d25df516..dfa005abb6ec 100644 --- a/pkgs/applications/blockchains/masari.nix +++ b/pkgs/applications/blockchains/masari.nix @@ -2,7 +2,7 @@ , lmdb, miniupnpc, readline }: stdenv.mkDerivation rec { - name = "masari-${version}"; + pname = "masari"; version = "0.1.4.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index aaff39f1c6be..92f6f0080219 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub -, wrapQtAppsHook, makeDesktopItem +{ mkDerivation, lib, makeDesktopItem, fetchFromGitHub , qtbase, qmake, qtmultimedia, qttools , qtgraphicaleffects, qtdeclarative , qtlocation, qtquickcontrols, qtquickcontrols2 @@ -9,22 +8,10 @@ , hidapi }: -with stdenv.lib; +with lib; -let - qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; - - qml2ImportPath = concatMapStringsSep ":" qmlPath [ - qtbase.bin qtmultimedia.bin qtgraphicaleffects - qtdeclarative.bin qtlocation.bin - qtquickcontrols qtquickcontrols2.bin - qtwebchannel.bin qtwebengine.bin qtxmlpatterns - ]; - -in - -stdenv.mkDerivation rec { - name = "monero-gui-${version}"; +mkDerivation rec { + pname = "monero-gui"; version = "0.14.1.2"; src = fetchFromGitHub { @@ -34,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k"; }; - nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtmultimedia qtgraphicaleffects @@ -46,9 +33,7 @@ stdenv.mkDerivation rec { cppzmq hidapi ]; - patches = [ - ./move-log-file.patch - ]; + patches = [ ./move-log-file.patch ]; postPatch = '' echo ' diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index f351c9fa5043..b6f074528616 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -11,7 +11,7 @@ assert stdenv.isDarwin -> IOKit != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "monero-${version}"; + pname = "monero"; version = "0.14.1.0"; src = fetchgit { diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 58ab367c020f..a8d29ae149d9 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "nano-wallet-${version}"; + pname = "nano-wallet"; version = "18.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/parity-ui/default.nix b/pkgs/applications/blockchains/parity-ui/default.nix index c59b2ccb8ac3..0615aed2ca03 100644 --- a/pkgs/applications/blockchains/parity-ui/default.nix +++ b/pkgs/applications/blockchains/parity-ui/default.nix @@ -5,13 +5,13 @@ let uiEnv = pkgs.callPackage ./env.nix { }; in stdenv.mkDerivation rec { - name = "parity-ui-${version}"; + pname = "parity-ui"; version = "0.3.4"; src = fetchurl { url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb"; sha256 = "1xbd00r9ph8w2d6d2c5xg4b5l74ljzs50rpc6kahfznypmh4kr73"; - name = "${name}.deb"; + name = "${pname}-${version}.deb"; }; nativeBuildInputs = [ makeWrapper nodePackages.asar ]; diff --git a/pkgs/applications/blockchains/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix index 4b6a88fd410a..a936691bd799 100644 --- a/pkgs/applications/blockchains/parity/beta.nix +++ b/pkgs/applications/blockchains/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.6.1"; - sha256 = "0yvscs2ivy08zla3jhirxhwwaqsn9j5ml4sqbgx6h5rh19c941vh"; - cargoSha256 = "1s3c44cggajrmc504klf4cyb1s4l5ny48yihs9c3fc0n8d064017"; + version = "2.6.2"; + sha256 = "1j4249m5k3bi7di0wq6fm64zv3nlpgmg4hr5hnn94fyc09nz9n1r"; + cargoSha256 = "18zd91n04wck3gd8szj4vxn3jq0bzq0h3rg0wcs6nzacbzhcx2sw"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix index 873f83190fde..9b5a72077d5c 100644 --- a/pkgs/applications/blockchains/parity/default.nix +++ b/pkgs/applications/blockchains/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.5.6"; - sha256 = "1qkrqkkgjvm27babd6bidhf1n6vdp8rac1zy5kf61nfzplxzr2dy"; + version = "2.5.7"; + sha256 = "0aprs71cbf98dsvjz0kydngkvdg5x7dijji8j6xadgvsarl1ljnj"; cargoSha256 = "0aa0nkv3jr7cdzswbxghxxv0y65a59jgs1682ch8vrasi0x17m1x"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/blockchains/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix index 79831f3304df..fbc43cd3402c 100644 --- a/pkgs/applications/blockchains/parity/parity.nix +++ b/pkgs/applications/blockchains/parity/parity.nix @@ -7,11 +7,10 @@ , fetchFromGitHub , rustPlatform -, pkgconfig +, cmake , openssl +, pkgconfig , systemd -, cmake -, perl }: rustPlatform.buildRustPackage rec { @@ -26,10 +25,9 @@ rustPlatform.buildRustPackage rec { inherit sha256; }; - buildInputs = [ - pkgconfig cmake perl - systemd.lib systemd.dev openssl openssl.dev - ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ openssl systemd ]; cargoBuildFlags = [ "--features final" ]; diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix index f5efa0bb52c2..613d57cd9c8c 100644 --- a/pkgs/applications/blockchains/particl/particl-core.nix +++ b/pkgs/applications/blockchains/particl/particl-core.nix @@ -16,7 +16,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "particl-core-${version}"; + pname = "particl-core"; version = "0.17.1.2"; src = fetchurl { diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index e2cf8aa182f3..c0833de7dbf3 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -9,7 +9,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "pivx-${version}"; + pname = "pivx"; version = "3.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix index 026008b2761a..ad65da057aec 100644 --- a/pkgs/applications/blockchains/sumokoin.nix +++ b/pkgs/applications/blockchains/sumokoin.nix @@ -2,7 +2,7 @@ , libunwind, lmdb, miniupnpc }: stdenv.mkDerivation rec { - name = "sumokoin-${version}"; + pname = "sumokoin"; version = "0.2.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/wownero.nix b/pkgs/applications/blockchains/wownero.nix index 7aed32978326..365afb5a2411 100644 --- a/pkgs/applications/blockchains/wownero.nix +++ b/pkgs/applications/blockchains/wownero.nix @@ -6,7 +6,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "wownero-${version}"; + pname = "wownero"; version = "0.6.1.2"; src = fetchFromGitHub { |