From 1488b3efdc768768b709e4f81426837c1736871f Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 19:18:35 +0900 Subject: [PATCH 1/3] python312Packages.rustworkx: 0.14.2 -> 0.15.1 Diff: https://github.com/Qiskit/rustworkx/compare/0.14.2...0.15.1 --- pkgs/development/python-modules/rustworkx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index 3f17b45e2d20..2fa64b6d7bc4 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -16,19 +16,19 @@ buildPythonPackage rec { pname = "rustworkx"; - version = "0.14.2"; + version = "0.15.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Qiskit"; repo = pname; rev = version; - hash = "sha256-gck5X6J4Yg5it/YCBsk/yZ5qXg/iwCEbyDIKfBTRxHM="; + hash = "sha256-0WYgShihTBM0e+MIhON0dnhZug6l280tZcVp3KF1Jq0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-FNCa5pshcnsYpjlz6yDITe2k0cHLTybj3rF34qrsRVU="; + hash = "sha256-AgHfCKLna30WERAFGEs8yRxxZHwvLzR+/S+ivwKHXXE="; }; nativeBuildInputs = [ From b685ddd6b8e2e733c17c060969ae5d0dafd11391 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 22:39:37 +0900 Subject: [PATCH 2/3] python312Packages.rustworkx: switch to pypa builder --- pkgs/development/python-modules/rustworkx/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index 2fa64b6d7bc4..8cda7ed35704 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -4,6 +4,7 @@ cargo, rustPlatform, rustc, + setuptools, setuptools-rust, numpy, fixtures, @@ -17,11 +18,11 @@ buildPythonPackage rec { pname = "rustworkx"; version = "0.15.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Qiskit"; - repo = pname; + repo = "rustworkx"; rev = version; hash = "sha256-0WYgShihTBM0e+MIhON0dnhZug6l280tZcVp3KF1Jq0="; }; @@ -32,12 +33,16 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools-rust rustPlatform.cargoSetupHook cargo rustc ]; + build-system = [ + setuptools + setuptools-rust + ]; + buildInputs = [ numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; checkInputs = [ From 897f4ea6eb52175eade45f89d23736177829c50f Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 22:40:10 +0900 Subject: [PATCH 3/3] python312Packages.rustworkx: enable tests --- pkgs/development/python-modules/rustworkx/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index 8cda7ed35704..d2ee15fa36b1 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -13,6 +13,7 @@ libiconv, stdenv, lib, + pytestCheckHook, }: buildPythonPackage rec { @@ -45,12 +46,17 @@ buildPythonPackage rec { buildInputs = [ numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - checkInputs = [ + nativeCheckInputs = [ fixtures networkx + pytestCheckHook testtools ]; + preCheck = '' + rm -r rustworkx + ''; + pythonImportsCheck = [ "rustworkx" ]; meta = with lib; {