From 12672f90c5898ae7231f7c2bef077d93fcb57828 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 5 Mar 2021 14:26:31 -0500 Subject: [PATCH 1/4] python3Packages.retworkx: 0.6.0 -> 0.8.0 --- .../python-modules/retworkx/default.nix | 14 ++++++++------ pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index 8cce139facb..c4b7a6323e4 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -1,39 +1,41 @@ { lib , buildPythonPackage +, pythonOlder , rustPlatform , fetchFromGitHub # Check inputs , pytestCheckHook +, networkx , numpy }: buildPythonPackage rec { pname = "retworkx"; - version = "0.6.0"; + version = "0.8.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Qiskit"; repo = "retworkx"; rev = version; - sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20"; + sha256 = "0plpri6a3d6f1000kmcah9066vq2i37d14bdf8sm96493fhpqhrd"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0="; + hash = "sha256-+k779gmge8wDdoZrWn9ND47kUqt7pqe75Zuj2Byfefo="; }; - format = "pyproject"; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) doCheck = false; doInstallCheck = true; - installCheckInputs = [ pytestCheckHook numpy ]; + installCheckInputs = [ pytestCheckHook networkx numpy ]; preCheck = '' export TESTDIR=$(mktemp -d) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a392ef3764f..8869631a5fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6951,7 +6951,7 @@ in { retrying = callPackage ../development/python-modules/retrying { }; - retworkx = disabledIf (pythonOlder "3.5") (toPythonModule (callPackage ../development/python-modules/retworkx { })); + retworkx = callPackage ../development/python-modules/retworkx { }; rfc3986 = callPackage ../development/python-modules/rfc3986 { }; From 302cafc29d3b600459e83ed8ace16a00d5cbfb79 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 25 Feb 2021 11:43:35 -0500 Subject: [PATCH 2/4] python3Packages.qiskit-aer: 0.7.4 -> 0.7.6 --- pkgs/development/python-modules/qiskit-aer/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index bb04309d1a5..10a3b4482fc 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -27,7 +27,8 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.7.4"; + version = "0.7.6"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -35,7 +36,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo="; + sha256 = "0595as4rxjrd5dqx54ywz3rjsjk0z7r41bq0z9r8y1h7zgvvlrmn"; }; nativeBuildInputs = [ @@ -64,6 +65,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," "" ''; + # Disable using conan for build preBuild = '' export DISABLE_CONAN=1 ''; From 65444f26e78bce231b78b94f9a548008b5c41b81 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 5 Mar 2021 14:30:37 -0500 Subject: [PATCH 3/4] python3Packages.qiskit-ibmq-provider: 0.11.1 -> 0.12.1 --- .../python-modules/qiskit-ibmq-provider/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 7374d7ce017..9346fae9743 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -22,6 +22,7 @@ , nbconvert , nbformat , pproxy +, qiskit-aer , vcrpy }: @@ -38,7 +39,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.11.1"; + version = "0.12.1"; disabled = pythonOlder "3.6"; @@ -46,7 +47,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0b5mnq8f5844idnsmp84lpkvlpszfwwi998yvggcgaayw1dbk53h"; + sha256 = "1i5dj5dl0hxqd61bdflyy6yq958fj9qhf6s6m40n1vnql7g50gdx"; }; propagatedBuildInputs = [ @@ -64,6 +65,7 @@ buildPythonPackage rec { nbconvert nbformat pproxy + qiskit-aer vcrpy ] ++ lib.optionals (!withVisualization) visualizationPackages; From 82b087fa97b94b6ce13c2879bf50c6e47c4fc92b Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 25 Feb 2021 11:43:52 -0500 Subject: [PATCH 4/4] python3Packages.qiskit: 0.23.5 -> 0.24.0 --- pkgs/development/python-modules/qiskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 3c7a0044202..5051c6541cd 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.23.5"; + version = "0.24.0"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - sha256 = "sha256-qtMFztAeqNz0FSgQnOOrvAdPcbUCAal7KrVmpNvvBiY="; + sha256 = "1b78q75bi666v0yj33bkjlc40d2172dsq5yp1s2kkisjfa8qmh7h"; }; propagatedBuildInputs = [