From 0f43bd7fb7b291c4fe48593ea0219118bfce5b8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 21:34:42 +0000 Subject: [PATCH 1/4] python310Packages.bitcoinlib: 0.11.0 -> 0.11.2 --- pkgs/development/python-modules/bitcoinlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index f3eb86c7bbb1..afdb5e84b414 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -3,15 +3,15 @@ let ext = if stdenv.isDarwin then "dylib" else "so"; in buildPythonPackage rec { pname = "bitcoinlib"; - version = "0.11.0"; + version = "0.11.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "petertodd"; repo = "python-bitcoinlib"; - rev = "python-${pname}-v${version}"; - sha256 = "0pwypd966zzivb37fvg4l6yr7ihplqnr1jwz9zm3biip7x89bdzm"; + rev = "refs/tags/python-bitcoinlib-v${version}"; + sha256 = "sha256-/VgCTN010W/Svdrs0mGA8W1YZnyTHhcaWJKgP/c8CN8="; }; postPatch = '' From f0c060bedee824ce085bc52cc934a8c828d44e91 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 8 Sep 2022 21:35:00 +0000 Subject: [PATCH 2/4] python310Packages.bitcoinlib: use hostPlatform.extensions.sharedLibrary --- pkgs/development/python-modules/bitcoinlib/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index afdb5e84b414..de64b53d0775 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, buildPythonPackage, isPy3k, fetchFromGitHub, openssl }: -let ext = if stdenv.isDarwin then "dylib" else "so"; -in buildPythonPackage rec { +buildPythonPackage rec { pname = "bitcoinlib"; version = "0.11.2"; @@ -17,7 +16,7 @@ in buildPythonPackage rec { postPatch = '' substituteInPlace bitcoin/core/key.py --replace \ "ctypes.util.find_library('ssl') or 'libeay32'" \ - "'${lib.getLib openssl}/lib/libssl.${ext}'" + "'${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; meta = { From 5bd049fe7b575726465d2462b50c84f6261243ba Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 8 Sep 2022 21:35:00 +0000 Subject: [PATCH 3/4] python310Packages.bitcoinlib: update meta --- .../python-modules/bitcoinlib/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index de64b53d0775..03d7db7ead02 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -7,8 +7,8 @@ buildPythonPackage rec { disabled = !isPy3k; src = fetchFromGitHub { - owner = "petertodd"; - repo = "python-bitcoinlib"; + owner = "petertodd"; + repo = "python-bitcoinlib"; rev = "refs/tags/python-bitcoinlib-v${version}"; sha256 = "sha256-/VgCTN010W/Svdrs0mGA8W1YZnyTHhcaWJKgP/c8CN8="; }; @@ -19,10 +19,11 @@ buildPythonPackage rec { "'${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; - meta = { - homepage = src.meta.homepage; + meta = with lib; { + homepage = "https://github.com/petertodd/python-bitcoinlib"; description = "Easy interface to the Bitcoin data structures and protocol"; - license = with lib.licenses; [ lgpl3 ]; - maintainers = with lib.maintainers; [ jb55 ]; + changelog = "https://github.com/petertodd/python-bitcoinlib/raw/${src.rev}/release-notes.md"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ jb55 ]; }; } From bad2cd8a4ee7be3cfc2d95a980dacc63e961035b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 8 Sep 2022 21:35:00 +0000 Subject: [PATCH 4/4] python310Packages.bitcoinlib: add pythonImportsCheck --- pkgs/development/python-modules/bitcoinlib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index 03d7db7ead02..8daff7913cc2 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { "'${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; + pythonImportsCheck = [ "bitcoin" "bitcoin.core.key" ]; + meta = with lib; { homepage = "https://github.com/petertodd/python-bitcoinlib"; description = "Easy interface to the Bitcoin data structures and protocol";