git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115211 from drewrisinger/dr-pr-qiskit-bump
commit8fe81697a6a010de7f0acdf01856831245443af9 authorSandro <sandro.jaeckel@gmail.com> dateSat 6 Mar 2021, 01:02 (6 years ago) parent54235b982b087f
5 files changed+19−13
pkgs/development/python-modules/qiskit-aer/default.nix+4−2 pkgs/development/python-modules/qiskit-ibmq-provider/default.nix+4−2 pkgs/development/python-modules/qiskit/default.nix+2−2 pkgs/development/python-modules/retworkx/default.nix+8−6 pkgs/top-level/python-packages.nix+1−1
pkgs/development/python-modules/qiskit-aer/default.nix+4−2
@@ -27,7 +27,8 @@
2727
2828buildPythonPackage rec {
2929 pname = "qiskit-aer";
30− version = "0.7.4";
30+ version = "0.7.6";
31+ format = "pyproject";
3132
3233 disabled = pythonOlder "3.6";
3334
@@ -35,7 +36,7 @@ buildPythonPackage rec {
3536 owner = "Qiskit";
3637 repo = "qiskit-aer";
3738 rev = version;
38− sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo=";
39+ sha256 = "0595as4rxjrd5dqx54ywz3rjsjk0z7r41bq0z9r8y1h7zgvvlrmn";
3940 };
4041
4142 nativeBuildInputs = [
@@ -64,6 +65,7 @@ buildPythonPackage rec {
6465 substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," ""
6566 '';
6667
68+ # Disable using conan for build
6769 preBuild = ''
6870 export DISABLE_CONAN=1
6971 '';
pkgs/development/python-modules/qiskit-ibmq-provider/default.nix+4−2
@@ -22,6 +22,7 @@
2222, nbconvert
2323, nbformat
2424, pproxy
25+, qiskit-aer
2526, vcrpy
2627}:
2728
@@ -38,7 +39,7 @@ let
3839in
3940buildPythonPackage rec {
4041 pname = "qiskit-ibmq-provider";
41− version = "0.11.1";
42+ version = "0.12.1";
4243
4344 disabled = pythonOlder "3.6";
4445
@@ -46,7 +47,7 @@ buildPythonPackage rec {
4647 owner = "Qiskit";
4748 repo = pname;
4849 rev = version;
49− sha256 = "0b5mnq8f5844idnsmp84lpkvlpszfwwi998yvggcgaayw1dbk53h";
50+ sha256 = "1i5dj5dl0hxqd61bdflyy6yq958fj9qhf6s6m40n1vnql7g50gdx";
5051 };
5152
5253 propagatedBuildInputs = [
@@ -64,6 +65,7 @@ buildPythonPackage rec {
6465 nbconvert
6566 nbformat
6667 pproxy
68+ qiskit-aer
6769 vcrpy
6870 ] ++ lib.optionals (!withVisualization) visualizationPackages;
6971
pkgs/development/python-modules/qiskit/default.nix+2−2
@@ -15,7 +15,7 @@
1515buildPythonPackage rec {
1616 pname = "qiskit";
1717 # 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";
1919
2020 disabled = pythonOlder "3.6";
2121
@@ -23,7 +23,7 @@ buildPythonPackage rec {
2323 owner = "qiskit";
2424 repo = "qiskit";
2525 rev = version;
26− sha256 = "sha256-qtMFztAeqNz0FSgQnOOrvAdPcbUCAal7KrVmpNvvBiY=";
26+ sha256 = "1b78q75bi666v0yj33bkjlc40d2172dsq5yp1s2kkisjfa8qmh7h";
2727 };
2828
2929 propagatedBuildInputs = [
pkgs/development/python-modules/retworkx/default.nix+8−6
@@ -1,39 +1,41 @@
11{ lib
22, buildPythonPackage
3+, pythonOlder
34, rustPlatform
45, fetchFromGitHub
56
67 # Check inputs
78, pytestCheckHook
9+, networkx
810, numpy
911}:
1012
1113buildPythonPackage rec {
1214 pname = "retworkx";
13− version = "0.6.0";
15+ version = "0.8.0";
16+ format = "pyproject";
17+ disabled = pythonOlder "3.6";
1418
1519 src = fetchFromGitHub {
1620 owner = "Qiskit";
1721 repo = "retworkx";
1822 rev = version;
19− sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20";
23+ sha256 = "0plpri6a3d6f1000kmcah9066vq2i37d14bdf8sm96493fhpqhrd";
2024 };
2125
2226 cargoDeps = rustPlatform.fetchCargoTarball {
2327 inherit src;
2428 name = "${pname}-${version}";
25− hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0=";
29+ hash = "sha256-+k779gmge8wDdoZrWn9ND47kUqt7pqe75Zuj2Byfefo=";
2630 };
2731
28− format = "pyproject";
29−
3032 nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
3133
3234 # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage)
3335 doCheck = false;
3436 doInstallCheck = true;
3537
36− installCheckInputs = [ pytestCheckHook numpy ];
38+ installCheckInputs = [ pytestCheckHook networkx numpy ];
3739
3840 preCheck = ''
3941 export TESTDIR=$(mktemp -d)
pkgs/top-level/python-packages.nix+1−1
@@ -6951,7 +6951,7 @@ in {
69516951
69526952 retrying = callPackage ../development/python-modules/retrying { };
69536953
6954− retworkx = disabledIf (pythonOlder "3.5") (toPythonModule (callPackage ../development/python-modules/retworkx { }));
6954+ retworkx = callPackage ../development/python-modules/retworkx { };
69556955
69566956 rfc3986 = callPackage ../development/python-modules/rfc3986 { };
69576957