diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix index 72ba6c38f847..1c491cb5de0f 100644 --- a/pkgs/development/python-modules/blspy/default.nix +++ b/pkgs/development/python-modules/blspy/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , fetchFromGitHub -, fetchpatch , setuptools-scm , substituteAll , cmake @@ -14,12 +13,12 @@ buildPythonPackage rec { pname = "blspy"; - version = "1.0.6"; + version = "1.0.8"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sULXnecEs8VI687pR9EK9jjYWlrB4tV4dt7Kzekaxb4="; + hash = "sha256-yKLirwWWeUTs5BFXZfqfuNJUXtQW40EiNPxuP+FeHso="; }; patches = [ @@ -40,12 +39,12 @@ buildPythonPackage rec { sha256 = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA="; fetchSubmodules = true; }; - }) - - # avoid dynamic linking error at import time - (fetchpatch { - url = "https://github.com/Chia-Network/bls-signatures/pull/287/commits/797241e9dae1c164c862cbdb38c865d4b124a601.patch"; - sha256 = "sha256-tlc4aA75gUxt5OaSNZqIlO//PXjmddVgVLYuVEFNmkE="; + catch2_src = fetchFromGitHub { + owner = "catchorg"; + repo = "Catch2"; + rev = "v2.13.7"; # pinned by blspy + sha256 = "NhZ8Hh7dka7KggEKKZyEbIZahuuTYeCT7cYYSUvkPzI="; + }; }) ]; diff --git a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch index a480c6d37083..337c8df3c4e5 100644 --- a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch @@ -48,3 +48,17 @@ index 5a8c381..d9aa940 100644 ) FetchContent_MakeAvailable(pybind11 relic) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 449164a..15a955e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -37,8 +37,7 @@ install(FILES $ DESTINATION lib) + if(BUILD_BLS_TESTS) + FetchContent_Declare( + Catch2 +- GIT_REPOSITORY https://github.com/catchorg/Catch2.git +- GIT_TAG v2.13.7 ++ URL @catch2_src@ + ) + FetchContent_MakeAvailable(Catch2) + add_executable(runtest test.cpp)