Merge pull request #115211 from drewrisinger/dr-pr-qiskit-bump

authored by

Sandro and committed by
GitHub
8fe81697 54235b9b

+19 -13
+4 -2
pkgs/development/python-modules/qiskit-aer/default.nix
··· 27 27 28 28 buildPythonPackage rec { 29 29 pname = "qiskit-aer"; 30 - version = "0.7.4"; 30 + version = "0.7.6"; 31 + format = "pyproject"; 31 32 32 33 disabled = pythonOlder "3.6"; 33 34 ··· 35 36 owner = "Qiskit"; 36 37 repo = "qiskit-aer"; 37 38 rev = version; 38 - sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo="; 39 + sha256 = "0595as4rxjrd5dqx54ywz3rjsjk0z7r41bq0z9r8y1h7zgvvlrmn"; 39 40 }; 40 41 41 42 nativeBuildInputs = [ ··· 64 65 substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," "" 65 66 ''; 66 67 68 + # Disable using conan for build 67 69 preBuild = '' 68 70 export DISABLE_CONAN=1 69 71 '';
+4 -2
pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
··· 22 22 , nbconvert 23 23 , nbformat 24 24 , pproxy 25 + , qiskit-aer 25 26 , vcrpy 26 27 }: 27 28 ··· 38 39 in 39 40 buildPythonPackage rec { 40 41 pname = "qiskit-ibmq-provider"; 41 - version = "0.11.1"; 42 + version = "0.12.1"; 42 43 43 44 disabled = pythonOlder "3.6"; 44 45 ··· 46 47 owner = "Qiskit"; 47 48 repo = pname; 48 49 rev = version; 49 - sha256 = "0b5mnq8f5844idnsmp84lpkvlpszfwwi998yvggcgaayw1dbk53h"; 50 + sha256 = "1i5dj5dl0hxqd61bdflyy6yq958fj9qhf6s6m40n1vnql7g50gdx"; 50 51 }; 51 52 52 53 propagatedBuildInputs = [ ··· 64 65 nbconvert 65 66 nbformat 66 67 pproxy 68 + qiskit-aer 67 69 vcrpy 68 70 ] ++ lib.optionals (!withVisualization) visualizationPackages; 69 71
+2 -2
pkgs/development/python-modules/qiskit/default.nix
··· 15 15 buildPythonPackage rec { 16 16 pname = "qiskit"; 17 17 # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history 18 - version = "0.23.5"; 18 + version = "0.24.0"; 19 19 20 20 disabled = pythonOlder "3.6"; 21 21 ··· 23 23 owner = "qiskit"; 24 24 repo = "qiskit"; 25 25 rev = version; 26 - sha256 = "sha256-qtMFztAeqNz0FSgQnOOrvAdPcbUCAal7KrVmpNvvBiY="; 26 + sha256 = "1b78q75bi666v0yj33bkjlc40d2172dsq5yp1s2kkisjfa8qmh7h"; 27 27 }; 28 28 29 29 propagatedBuildInputs = [
+8 -6
pkgs/development/python-modules/retworkx/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 + , pythonOlder 3 4 , rustPlatform 4 5 , fetchFromGitHub 5 6 6 7 # Check inputs 7 8 , pytestCheckHook 9 + , networkx 8 10 , numpy 9 11 }: 10 12 11 13 buildPythonPackage rec { 12 14 pname = "retworkx"; 13 - version = "0.6.0"; 15 + version = "0.8.0"; 16 + format = "pyproject"; 17 + disabled = pythonOlder "3.6"; 14 18 15 19 src = fetchFromGitHub { 16 20 owner = "Qiskit"; 17 21 repo = "retworkx"; 18 22 rev = version; 19 - sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20"; 23 + sha256 = "0plpri6a3d6f1000kmcah9066vq2i37d14bdf8sm96493fhpqhrd"; 20 24 }; 21 25 22 26 cargoDeps = rustPlatform.fetchCargoTarball { 23 27 inherit src; 24 28 name = "${pname}-${version}"; 25 - hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0="; 29 + hash = "sha256-+k779gmge8wDdoZrWn9ND47kUqt7pqe75Zuj2Byfefo="; 26 30 }; 27 31 28 - format = "pyproject"; 29 - 30 32 nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; 31 33 32 34 # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) 33 35 doCheck = false; 34 36 doInstallCheck = true; 35 37 36 - installCheckInputs = [ pytestCheckHook numpy ]; 38 + installCheckInputs = [ pytestCheckHook networkx numpy ]; 37 39 38 40 preCheck = '' 39 41 export TESTDIR=$(mktemp -d)
+1 -1
pkgs/top-level/python-packages.nix
··· 6951 6951 6952 6952 retrying = callPackage ../development/python-modules/retrying { }; 6953 6953 6954 - retworkx = disabledIf (pythonOlder "3.5") (toPythonModule (callPackage ../development/python-modules/retworkx { })); 6954 + retworkx = callPackage ../development/python-modules/retworkx { }; 6955 6955 6956 6956 rfc3986 = callPackage ../development/python-modules/rfc3986 { }; 6957 6957