summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2023-09-15 14:05:55 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2023-09-27 15:32:52 +0200
commit8fad29c518e0ef0533508d98c640307b1b5df330 (patch)
tree3420bf48a4793c1c7921bfb497986c64d7d4a976
parentb1335210272bcb7c695dc6cfdb08d61fa3fbec96 (diff)
downloadnixpkgs-8fad29c518e0ef0533508d98c640307b1b5df330.tar
nixpkgs-8fad29c518e0ef0533508d98c640307b1b5df330.tar.gz
nixpkgs-8fad29c518e0ef0533508d98c640307b1b5df330.tar.bz2
nixpkgs-8fad29c518e0ef0533508d98c640307b1b5df330.tar.lz
nixpkgs-8fad29c518e0ef0533508d98c640307b1b5df330.tar.xz
nixpkgs-8fad29c518e0ef0533508d98c640307b1b5df330.tar.zst
nixpkgs-8fad29c518e0ef0533508d98c640307b1b5df330.zip
python3Packages.cirq-core: 1.1.0 -> 1.2.0
-rw-r--r--pkgs/development/python-modules/cirq-core/default.nix22
1 files changed, 5 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..88d2b5115b3 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -32,36 +32,24 @@
 
 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.7";
 
   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 = [
     duet