public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89247 from mmilata/python-bitcoinlib-0.11.0

Browse Source 
pythonPackages.bitcoinlib: 0.9.0 -> 0.11.0
This commit is contained in:
Marek Mahut 2020-06-22 18:49:19 +02:00 committed by GitHub
commit 6d5bbeb8fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/bitcoinlib/default.nix
View File

@ -1,15 +1,17 @@
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, openssl }: { stdenv, lib, buildPythonPackage, isPy3k, fetchFromGitHub, openssl }:
let ext = if stdenv.isDarwin then "dylib" else "so"; let ext = if stdenv.isDarwin then "dylib" else "so";
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "bitcoinlib"; pname = "bitcoinlib";
version = "0.9.0"; version = "0.11.0";
disabled = !isPy3k;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "petertodd"; owner = "petertodd";
rev = "7a8a47ec6b722339de1d0a8144e55b400216f90f";
repo = "python-bitcoinlib"; repo = "python-bitcoinlib";
sha256 = "1s1jm2nid7ab7yiwlp1n2v3was9i4q76xmm07wvzpd2zvn5zb91z"; rev = "python-${pname}-v${version}";
sha256 = "0pwypd966zzivb37fvg4l6yr7ihplqnr1jwz9zm3biip7x89bdzm";
}; };
postPatch = '' postPatch = ''
@ -21,7 +23,7 @@ in buildPythonPackage rec {
meta = { meta = {
homepage = src.meta.homepage; homepage = src.meta.homepage;
description = "Easy interface to the Bitcoin data structures and protocol"; description = "Easy interface to the Bitcoin data structures and protocol";
license = with lib.licenses; [ gpl3 ]; license = with lib.licenses; [ lgpl3 ];
maintainers = with lib.maintainers; [ jb55 ]; maintainers = with lib.maintainers; [ jb55 ];
}; };
} }

10
pkgs/development/python-modules/opentimestamps/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k { lib, buildPythonPackage, fetchFromGitHub, fetchpatch, isPy3k
, bitcoinlib, GitPython, pysha3, git }: , bitcoinlib, GitPython, pysha3, git }:
buildPythonPackage rec { buildPythonPackage rec {
@ -15,6 +15,14 @@ buildPythonPackage rec {
sha256 = "0c45ij8absfgwizq6dfgg81siq3y8605sgg184vazp292w8nqmqr"; sha256 = "0c45ij8absfgwizq6dfgg81siq3y8605sgg184vazp292w8nqmqr";
}; };
patches = [
# build against bitcoinlib-0.11
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/opentimestamps/python-opentimestamps/pull/43.patch";
sha256 = "0bxzk4pzpqk7zrk2x7vn2bj2n3pc5whf8ijbd225s6674q450zbg";
})
];
# Remove a failing test which expects the test source file to reside in the # Remove a failing test which expects the test source file to reside in the
# project's Git repo # project's Git repo
postPatch = '' postPatch = ''