diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index aa02de42fb32..5b304bf38984 100644 --- a/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -7,9 +7,9 @@ , qiskit-terra , requests , requests_ntlm -, websockets +, websocket-client # Visualization inputs -, withVisualization ? false +, withVisualization ? true , ipython , ipyvuetify , ipywidgets @@ -23,6 +23,7 @@ , nbformat , pproxy , qiskit-aer +, websockets , vcrpy }: @@ -39,7 +40,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.13.1"; + version = "0.18.1"; disabled = pythonOlder "3.6"; @@ -47,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - hash = "sha256-DlHlXncttzGo4uVoh2aQ7urW6krN3ej2sJ/EwuxeF2I="; + sha256 = "sha256-rySSCyI+62G7kL1ZRtjX1WeWj3LPXECvrlXAcIDINF4="; }; propagatedBuildInputs = [ @@ -56,9 +57,13 @@ buildPythonPackage rec { qiskit-terra requests requests_ntlm - websockets + websocket-client ] ++ lib.optionals withVisualization visualizationPackages; + postPatch = '' + substituteInPlace setup.py --replace "websocket-client>=1.0.1" "websocket-client" + ''; + # Most tests require credentials to run on IBMQ checkInputs = [ pytestCheckHook @@ -67,6 +72,7 @@ buildPythonPackage rec { pproxy qiskit-aer vcrpy + websockets ] ++ lib.optionals (!withVisualization) visualizationPackages; pythonImportsCheck = [ "qiskit.providers.ibmq" ]; @@ -75,6 +81,7 @@ buildPythonPackage rec { "test_old_api_url" "test_non_auth_url" "test_non_auth_url_with_hub" + "test_coder_optimizers" # TODO: reenable when package scikit-quant is packaged, either in NUR or nixpkgs # slow tests "test_websocket_retry_failure" |