From ef6e39fcedc6a51e380ff0aec599f4bcb849917a Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 9 Dec 2017 14:54:27 -0500 Subject: [PATCH 1/2] cryptop: 0.1 -> 0.2 Upgrade to new version. According to the upstream documentation, this project is only tested on python3, so I've upgraded the pkg's interpreter as well. Tested with nix-build and ./result/bin/cryptop --- pkgs/applications/altcoins/cryptop/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix index 0136ab18cea..05d5d8ee362 100644 --- a/pkgs/applications/altcoins/cryptop/default.nix +++ b/pkgs/applications/altcoins/cryptop/default.nix @@ -1,16 +1,16 @@ -{ lib, python2}: +{ lib, python3 }: -python2.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "cryptop"; - version = "0.1.0"; + version = "0.2.0"; name = "${pname}-${version}"; - src = python2.pkgs.fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "00glnlyig1aajh30knc5rnfbamwfxpg29js2db6mymjmfka8lbhh"; + sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb"; }; - propagatedBuildInputs = [ python2.pkgs.requests ]; + propagatedBuildInputs = [ python3.pkgs.requests python3.pkgs.requests-cache ]; # No tests in archive doCheck = false; From d1e3e83d6759ffc9a894756fafe9fa08f63f5101 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 9 Dec 2017 20:53:04 +0000 Subject: [PATCH 2/2] cryptop: alias to altcoins.cryptop --- pkgs/applications/altcoins/cryptop/default.nix | 9 ++++----- pkgs/applications/altcoins/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix index 05d5d8ee362..01c47b320de 100644 --- a/pkgs/applications/altcoins/cryptop/default.nix +++ b/pkgs/applications/altcoins/cryptop/default.nix @@ -1,16 +1,15 @@ -{ lib, python3 }: +{ lib, buildPythonApplication, fetchPypi, requests, requests-cache }: -python3.pkgs.buildPythonApplication rec { +buildPythonApplication rec { pname = "cryptop"; version = "0.2.0"; - name = "${pname}-${version}"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb"; }; - propagatedBuildInputs = [ python3.pkgs.requests python3.pkgs.requests-cache ]; + propagatedBuildInputs = [ requests requests-cache ]; # No tests in archive doCheck = false; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index aeab2953469..0e5ffab01f4 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2 }: +{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: rec { @@ -20,6 +20,8 @@ rec { btc1 = callPackage ./btc1.nix { withGui = true; }; btc1d = callPackage ./btc1.nix { withGui = false; }; + cryptop = python3.pkgs.callPackage ./cryptop { }; + dashpay = callPackage ./dashpay.nix { }; dogecoin = callPackage ./dogecoin.nix { withGui = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d5a4ec2512..82027769b7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13910,8 +13910,7 @@ with pkgs; altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } ); bitcoin = altcoins.bitcoin; bitcoin-xt = altcoins.bitcoin-xt; - - cryptop = callPackage ../applications/altcoins/cryptop { }; + cryptop = altcoins.cryptop; libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { secp256k1 = secp256k1.override { enableECDH = true; };