From 0a4a6f71cb37d2fb774d05ad83c7c1e03611be75 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 9 Sep 2017 21:11:39 +0200 Subject: [PATCH 1/2] bitcoin-classic: 1.2.5 -> 1.3.6 --- pkgs/applications/altcoins/bitcoin-classic.nix | 4 ++-- pkgs/applications/altcoins/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index 5f17eb3a1cf..d2878a17fb3 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version; - version = "1.2.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "bitcoinclassic"; repo = "bitcoinclassic"; rev = "v${version}"; - sha256 = "00spils0gv8krx2nyxrf6j1dl81wmxk8xjkqc22cv7nsdnakzrvm"; + sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index a67e5559a53..01e34a953bb 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -8,8 +8,8 @@ rec { bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; - bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; }; - bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; }; + bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; boost = pkgs.boost; }; + bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; boost = pkgs.boost; }; bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; }; From bb2e6d131e2aa004a1bd9c196f1e321733c239fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 11 Sep 2017 15:57:45 +0100 Subject: [PATCH 2/2] altcoins: remove pkgs non-sense --- pkgs/applications/altcoins/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 01e34a953bb..0fbc8cd3d17 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, pkgs }: +{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages }: rec { @@ -8,8 +8,8 @@ rec { bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; - bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; boost = pkgs.boost; }; - bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; boost = pkgs.boost; }; + bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; boost = boost162; }; + bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; boost = boost162; }; bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; }; @@ -22,12 +22,12 @@ rec { dogecoin = callPackage ./dogecoin.nix { withGui = true; }; dogecoind = callPackage ./dogecoin.nix { withGui = false; }; - freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; }; + freicoin = callPackage ./freicoin.nix { boost = boost155; }; go-ethereum = callPackage ./go-ethereum.nix { }; go-ethereum-classic = callPackage ./go-ethereum-classic { }; - hivemind = callPackage ./hivemind.nix { withGui = true; boost = pkgs.boost162; }; - hivemindd = callPackage ./hivemind.nix { withGui = false; boost = pkgs.boost162; }; + hivemind = callPackage ./hivemind.nix { withGui = true; boost = boost162; }; + hivemindd = callPackage ./hivemind.nix { withGui = false; boost = boost162; }; litecoin = callPackage ./litecoin.nix { withGui = true; }; litecoind = callPackage ./litecoin.nix { withGui = false; }; @@ -43,7 +43,7 @@ rec { seth = callPackage ./seth.nix { }; dapp = callPackage ./dapp.nix { }; - hsevm = (pkgs.haskellPackages.callPackage ./hsevm.nix {}); + hsevm = (haskellPackages.callPackage ./hsevm.nix {}); primecoin = callPackage ./primecoin.nix { withGui = true; }; primecoind = callPackage ./primecoin.nix { withGui = false; }; @@ -52,7 +52,7 @@ rec { zcash = callPackage ./zcash { withGui = false; - openssl = pkgs.openssl_1_1_0; - boost = pkgs.boost163; + openssl = openssl_1_1_0; + boost = boost163; }; }