alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

python3Packages.chiapos: 1.0.4 -> 1.0.6

Browse source
This commit is contained in:
Louis Bettens 2021-11-05 19:39:36 +01:00
parent 8ac539219d
commit 29791cd7aa
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/python-modules/chiapos/default.nix
View file

@ -6,6 +6,7 @@
, cxxopts , cxxopts
, ghc_filesystem , ghc_filesystem
, pybind11 , pybind11
, pytestCheckHook
, pythonOlder , pythonOlder
, psutil , psutil
, setuptools-scm , setuptools-scm
@ -13,12 +14,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "chiapos"; pname = "chiapos";
version = "1.0.4"; version = "1.0.6";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-flI1vwtD0H28UDMcEEELECewkXZ6vf/XEYMqRKy5R6w="; sha256 = "sha256-Zh5AULPgbG0oYPcBZMp/vm94MPyfdtYn4P5V+1LeMqA=";
}; };
patches = [ patches = [
@ -34,7 +35,11 @@ buildPythonPackage rec {
buildInputs = [ pybind11 ]; buildInputs = [ pybind11 ];
checkInputs = [ psutil ]; checkInputs = [
psutil
pytestCheckHook
];
# CMake needs to be run by setuptools rather than by its hook # CMake needs to be run by setuptools rather than by its hook
dontConfigure = true; dontConfigure = true;

9
pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch
View file

@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b4a2f5..86f849c 100644 index b757b70..fcce055 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -18,22 +18,19 @@ include(FetchContent) @@ -21,23 +21,20 @@ include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake)
else() else()
FetchContent_Declare( FetchContent_Declare(
pybind11-src pybind11-src
- GIT_REPOSITORY https://github.com/pybind/pybind11.git - GIT_REPOSITORY https://github.com/pybind/pybind11.git
- GIT_TAG v2.6.2 - GIT_TAG v2.7.1
+ SOURCE_DIR @pybind11_src@ + SOURCE_DIR @pybind11_src@
) )
FetchContent_MakeAvailable(pybind11-src) FetchContent_MakeAvailable(pybind11-src)
@ -29,4 +29,3 @@ index 9b4a2f5..86f849c 100644
) )
FetchContent_MakeAvailable(gulrak) FetchContent_MakeAvailable(gulrak)