public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sandro 2021-03-06 01:02:46 +01:00 committed by GitHub
commit 8fe81697a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/qiskit-aer/default.nix
View File

@ -27,7 +27,8 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "qiskit-aer"; pname = "qiskit-aer";
version = "0.7.4"; version = "0.7.6";
format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -35,7 +36,7 @@ buildPythonPackage rec {
owner = "Qiskit"; owner = "Qiskit";
repo = "qiskit-aer"; repo = "qiskit-aer";
rev = version; rev = version;
sha256 = "sha256-o6c1ZcGFZ3pwinzMTif1nqF29Wq0Nog1++ZoJGuiKxo="; sha256 = "0595as4rxjrd5dqx54ywz3rjsjk0z7r41bq0z9r8y1h7zgvvlrmn";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -64,6 +65,7 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," "" substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," ""
''; '';
# Disable using conan for build
preBuild = '' preBuild = ''
export DISABLE_CONAN=1 export DISABLE_CONAN=1
''; '';

6
pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
View File

@ -22,6 +22,7 @@
, nbconvert , nbconvert
, nbformat , nbformat
, pproxy , pproxy
, qiskit-aer
, vcrpy , vcrpy
}: }:
@ -38,7 +39,7 @@ let
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "qiskit-ibmq-provider"; pname = "qiskit-ibmq-provider";
version = "0.11.1"; version = "0.12.1";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -46,7 +47,7 @@ buildPythonPackage rec {
owner = "Qiskit"; owner = "Qiskit";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0b5mnq8f5844idnsmp84lpkvlpszfwwi998yvggcgaayw1dbk53h"; sha256 = "1i5dj5dl0hxqd61bdflyy6yq958fj9qhf6s6m40n1vnql7g50gdx";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -64,6 +65,7 @@ buildPythonPackage rec {
nbconvert nbconvert
nbformat nbformat
pproxy pproxy
qiskit-aer
vcrpy vcrpy
] ++ lib.optionals (!withVisualization) visualizationPackages; ] ++ lib.optionals (!withVisualization) visualizationPackages;

4
pkgs/development/python-modules/qiskit/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "qiskit"; pname = "qiskit";
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history # 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"; disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "qiskit"; owner = "qiskit";
repo = "qiskit"; repo = "qiskit";
rev = version; rev = version;
sha256 = "sha256-qtMFztAeqNz0FSgQnOOrvAdPcbUCAal7KrVmpNvvBiY="; sha256 = "1b78q75bi666v0yj33bkjlc40d2172dsq5yp1s2kkisjfa8qmh7h";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

14
pkgs/development/python-modules/retworkx/default.nix
View File

@ -1,39 +1,41 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, pythonOlder
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
# Check inputs # Check inputs
, pytestCheckHook , pytestCheckHook
, networkx
, numpy , numpy
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "retworkx"; pname = "retworkx";
version = "0.6.0"; version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Qiskit"; owner = "Qiskit";
repo = "retworkx"; repo = "retworkx";
rev = version; rev = version;
sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20"; sha256 = "0plpri6a3d6f1000kmcah9066vq2i37d14bdf8sm96493fhpqhrd";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0="; hash = "sha256-+k779gmge8wDdoZrWn9ND47kUqt7pqe75Zuj2Byfefo=";
}; };
format = "pyproject";
nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
# Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage)
doCheck = false; doCheck = false;
doInstallCheck = true; doInstallCheck = true;
installCheckInputs = [ pytestCheckHook numpy ]; installCheckInputs = [ pytestCheckHook networkx numpy ];
preCheck = '' preCheck = ''
export TESTDIR=$(mktemp -d) export TESTDIR=$(mktemp -d)

2
pkgs/top-level/python-packages.nix
View File

@ -6951,7 +6951,7 @@ in {
retrying = callPackage ../development/python-modules/retrying { }; 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 { }; rfc3986 = callPackage ../development/python-modules/rfc3986 { };