Merge pull request #225812 from ChrisPattison/rustworkx

pkgs/development/python-modules/qiskit-nature/default.nix

@@ -7,7 +7,7 @@
 , numpy
 , psutil
 , qiskit-terra
-, retworkx
+, rustworkx
 , scikit-learn
 , scipy
 , withPyscf ? false
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     numpy
     psutil
     qiskit-terra
-    retworkx
+    rustworkx
     scikit-learn
     scipy
   ] ++ lib.optional withPyscf pyscf;

pkgs/development/python-modules/qiskit-terra/default.nix

@@ -14,7 +14,7 @@
 , psutil
 , python-constraint
 , python-dateutil
-, retworkx
+, rustworkx
 , scipy
 , scikit-quant ? null
 , setuptools-rust
@@ -85,7 +85,7 @@ buildPythonPackage rec {
     psutil
     python-constraint
     python-dateutil
-    retworkx
+    rustworkx
     scipy
     scikit-quant
     stevedore

pkgs/development/python-modules/retworkx/default.nix

@@ -1,67 +0,0 @@
-{ lib
-, stdenv
-, buildPythonPackage
-, pythonOlder
-, rustPlatform
-, fetchFromGitHub
-, libiconv
-  # Check inputs
-, pytestCheckHook
-, fixtures
-, graphviz
-, matplotlib
-, networkx
-, numpy
-, pydot
-}:
-
-buildPythonPackage rec {
-  pname = "retworkx";
-  version = "0.11.0";
-  format = "pyproject";
-  disabled = pythonOlder "3.6";
-
-  src = fetchFromGitHub {
-    owner = "Qiskit";
-    repo = "retworkx";
-    rev = version;
-    hash = "sha256-o3XPMTaiFH5cBtyqtW650wiDBElLvCmERr2XwwdPO1c=";
-  };
-
-  cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit src;
-    name = "${pname}-${version}";
-    hash = "sha256-Zhk4m+HNtimhPWfiBLi9dqJ0fp2D8d0u9k6ROG0/jBo=";
-  };
-
-  nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
-
-  buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
-
-  pythonImportsCheck = [ "retworkx" ];
-  nativeCheckInputs = [
-    pytestCheckHook
-    fixtures
-    graphviz
-    matplotlib
-    networkx
-    numpy
-    pydot
-  ];
-
-  preCheck = ''
-    export TESTDIR=$(mktemp -d)
-    cp -r tests/ $TESTDIR
-    pushd $TESTDIR
-  '';
-  postCheck = "popd";
-
-  meta = with lib; {
-    description = "A python graph library implemented in Rust.";
-    homepage = "https://retworkx.readthedocs.io/en/latest/index.html";
-    downloadPage = "https://github.com/Qiskit/retworkx/releases";
-    changelog = "https://github.com/Qiskit/retworkx/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ drewrisinger ];
-  };
-}

pkgs/top-level/python-aliases.nix

@@ -251,6 +251,7 @@ mapAliases ({
   Quandl = quandl; # added 2023-02-19
   qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
   rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05
+  retworkx = rustworkx; # added 2023-05-14
   repeated_test = repeated-test; # added 2022-11-15
   requests_oauthlib = requests-oauthlib; # added 2022-02-12
   requests_toolbelt = requests-toolbelt; # added 2017-09-26

pkgs/top-level/python-packages.nix

@@ -10470,8 +10470,6 @@ self: super: with self; {
 
   returns = callPackage ../development/python-modules/returns { };
 
-  retworkx = callPackage ../development/python-modules/retworkx { };
-
   rfc3339 = callPackage ../development/python-modules/rfc3339 { };
 
   rfc3339-validator = callPackage ../development/python-modules/rfc3339-validator { };