git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #89247 from mmilata/python-bitcoinlib-0.11.0

pythonPackages.bitcoinlib: 0.9.0 -> 0.11.0

commit6d5bbeb8fe1ab7689ab95409c13758de6ae84fc8 authorMarek Mahut <marek.mahut@gmail.com> dateMon 22 Jun 2020, 18:49 (6 years ago) parente896ebce1f4e11
2 files changed+16−6
pkgs/development/python-modules/bitcoinlib/default.nix+7−5 pkgs/development/python-modules/opentimestamps/default.nix+9−1
pkgs/development/python-modules/bitcoinlib/default.nix+7−5
@@ -1,15 +1,17 @@
1−{ stdenv, lib, buildPythonPackage, fetchFromGitHub, openssl }:
1+{ stdenv, lib, buildPythonPackage, isPy3k, fetchFromGitHub, openssl }:
22
33let ext = if stdenv.isDarwin then "dylib" else "so";
44in buildPythonPackage rec {
55 pname = "bitcoinlib";
6− version = "0.9.0";
6+ version = "0.11.0";
7+
8+ disabled = !isPy3k;
79
810 src = fetchFromGitHub {
911 owner = "petertodd";
10− rev = "7a8a47ec6b722339de1d0a8144e55b400216f90f";
1112 repo = "python-bitcoinlib";
12− sha256 = "1s1jm2nid7ab7yiwlp1n2v3was9i4q76xmm07wvzpd2zvn5zb91z";
13+ rev = "python-${pname}-v${version}";
14+ sha256 = "0pwypd966zzivb37fvg4l6yr7ihplqnr1jwz9zm3biip7x89bdzm";
1315 };
1416
1517 postPatch = ''
@@ -21,7 +23,7 @@ in buildPythonPackage rec {
2123 meta = {
2224 homepage = src.meta.homepage;
2325 description = "Easy interface to the Bitcoin data structures and protocol";
24− license = with lib.licenses; [ gpl3 ];
26+ license = with lib.licenses; [ lgpl3 ];
2527 maintainers = with lib.maintainers; [ jb55 ];
2628 };
2729}
pkgs/development/python-modules/opentimestamps/default.nix+9−1
@@ -1,4 +1,4 @@
1−{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
1+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, isPy3k
22, bitcoinlib, GitPython, pysha3, git }:
33
44buildPythonPackage rec {
@@ -15,6 +15,14 @@ buildPythonPackage rec {
1515 sha256 = "0c45ij8absfgwizq6dfgg81siq3y8605sgg184vazp292w8nqmqr";
1616 };
1717
18+ patches = [
19+ # build against bitcoinlib-0.11
20+ (fetchpatch {
21+ url = "https://patch-diff.githubusercontent.com/raw/opentimestamps/python-opentimestamps/pull/43.patch";
22+ sha256 = "0bxzk4pzpqk7zrk2x7vn2bj2n3pc5whf8ijbd225s6674q450zbg";
23+ })
24+ ];
25+
1826 # Remove a failing test which expects the test source file to reside in the
1927 # project's Git repo
2028 postPatch = ''