summary refs log tree commit diff
diff options
context:
space:
mode:
authorFabian Affolter <mail@fabian-affolter.ch>2023-10-05 17:54:57 +0200
committerFabian Affolter <mail@fabian-affolter.ch>2023-10-05 17:54:57 +0200
commitba077857b1cb62afefa17d7adcc53c287e331aa0 (patch)
treea770a00cb98fea88fe7721f419cfd6b55c3bae7e
parente4b10f18ee2e140f3d2eb4319557dfec030d0e36 (diff)
downloadnixpkgs-ba077857b1cb62afefa17d7adcc53c287e331aa0.tar
nixpkgs-ba077857b1cb62afefa17d7adcc53c287e331aa0.tar.gz
nixpkgs-ba077857b1cb62afefa17d7adcc53c287e331aa0.tar.bz2
nixpkgs-ba077857b1cb62afefa17d7adcc53c287e331aa0.tar.lz
nixpkgs-ba077857b1cb62afefa17d7adcc53c287e331aa0.tar.xz
nixpkgs-ba077857b1cb62afefa17d7adcc53c287e331aa0.tar.zst
nixpkgs-ba077857b1cb62afefa17d7adcc53c287e331aa0.zip
python311Packages.cirq-core: 1.1.0 -> 1.2.0
-rw-r--r--pkgs/development/python-modules/cirq-core/default.nix23
1 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index ce188ce6811..bc3a92fe4ac 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -4,7 +4,6 @@
 , pythonAtLeast
 , pythonOlder
 , fetchFromGitHub
-, fetchpatch
 , duet
 , matplotlib
 , networkx
@@ -32,35 +31,23 @@
 
 buildPythonPackage rec {
   pname = "cirq-core";
-  version = "1.1.0";
+  version = "1.2.0";
   format = "setuptools";
 
-  # Upstream package is broken on Python 3.11 https://github.com/quantumlib/Cirq/issues/6018
-  disabled = pythonOlder "3.7" || pythonAtLeast "3.11";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "quantumlib";
     repo = "cirq";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5j4hbG95KRfRQTyyZgoNp/eHIcy0FphyEhbYnzyUMO4=";
+    hash = "sha256-KEei5PJ0ammsduZVmMh2vaW3f58DYI4BCrFCl/SjUoo=";
   };
 
   sourceRoot = "${src.name}/${pname}";
 
-  patches = [
-    # https://github.com/quantumlib/Cirq/pull/5991
-    (fetchpatch {
-      url = "https://build.opensuse.org/public/source/openSUSE:Factory/python-cirq/cirq-pr5991-np1.24.patch?rev=8";
-      stripLen = 1;
-      hash = "sha256-d2FpaxM1PsPWT9ZM9v2gVrnLCy9zmvkkyAVgo85eL3U=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace requirements.txt \
-      --replace "matplotlib~=3.0" "matplotlib" \
-      --replace "networkx~=2.4" "networkx" \
-      --replace "numpy>=1.16,<1.24" "numpy"
+      --replace "matplotlib~=3.0" "matplotlib"
   '';
 
   propagatedBuildInputs = [
@@ -106,6 +93,8 @@ buildPythonPackage rec {
     "test_json_and_repr_data"
     # Tests for some changed error handling behavior in SymPy 1.12
     "test_custom_value_not_implemented"
+    # Calibration issue
+    "test_xeb_to_calibration_layer"
   ];
 
   meta = with lib; {