diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
| commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
| tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/python-modules/qiskit-terra | |
| parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
| parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
| download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip | |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/qiskit-terra')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix b/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix index a5faf69f942e..8b83c506808e 100644 --- a/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , pythonOlder , buildPythonPackage , fetchFromGitHub @@ -56,7 +57,7 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.17.0"; + version = "0.17.4"; disabled = pythonOlder "3.6"; @@ -64,7 +65,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - hash = "sha256-LbNbaHAWAVG5YLc9juuwcOlrREBW6OjEl7VPtACfl3I="; + hash = "sha256-JyNuke+XPqjLVZbvPud9Y7k0+EmvETVKcOYcDldBiVo="; }; nativeBuildInputs = [ cython ]; @@ -106,11 +107,17 @@ buildPythonPackage rec { "test/python/classical_function_compiler/" ]; disabledTests = [ + # Not working on matplotlib >= 3.4.0, checks images match. + "test_plot_circuit_layout" + # Flaky tests "test_cx_equivalence" "test_pulse_limits" + "test_1q_random" ] ++ lib.optionals (!withClassicalFunctionCompiler) [ "TestPhaseOracle" + ] ++ lib.optionals stdenv.isAarch64 [ + "test_circuit_init" # failed on aarch64, https://gist.github.com/r-rmcgibbo/c2e173d43ced4f6954811004f6b5b842 ] # Disabling slow tests for build constraints ++ [ @@ -155,8 +162,8 @@ buildPythonPackage rec { pushd $PACKAGEDIR ''; postCheck = '' - rm -rf test - rm -rf examples + rm -r test + rm -r examples popd ''; |