summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-09-11 16:58:12 +0100
committerGitHub <noreply@github.com>2017-09-11 16:58:12 +0100
commit58ad01ab706e3a3b4b05fdc86a8edec518b005f8 (patch)
treedf45930621a6ce1e4e9c9432d3a802d87e22577d
parentf4bac5cdb782f087ffc2d633fce5ca4feca36354 (diff)
parentbb2e6d131e2aa004a1bd9c196f1e321733c239fa (diff)
downloadnixpkgs-58ad01ab706e3a3b4b05fdc86a8edec518b005f8.tar
nixpkgs-58ad01ab706e3a3b4b05fdc86a8edec518b005f8.tar.gz
nixpkgs-58ad01ab706e3a3b4b05fdc86a8edec518b005f8.tar.bz2
nixpkgs-58ad01ab706e3a3b4b05fdc86a8edec518b005f8.tar.lz
nixpkgs-58ad01ab706e3a3b4b05fdc86a8edec518b005f8.tar.xz
nixpkgs-58ad01ab706e3a3b4b05fdc86a8edec518b005f8.tar.zst
nixpkgs-58ad01ab706e3a3b4b05fdc86a8edec518b005f8.zip
Merge pull request #29156 from Lassulus/bitcoin-classic
bitcoin-classic: 1.2.5 -> 1.3.6
-rw-r--r--pkgs/applications/altcoins/bitcoin-classic.nix4
-rw-r--r--pkgs/applications/altcoins/default.nix18
2 files changed, 11 insertions, 11 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..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; };
-  bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; };
+  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;
   };
 }