From d1fce43f43bb8ccf76e0926a2e486d4c28aaa9b0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 4 Jul 2026 15:16:50 +0200
Subject: [PATCH] python3Packages.cirq-*: 1.6.1 -> 1.7.0

https://github.com/quantumlib/Cirq/releases/tag/v1.7.0
---
 .../python-modules/cirq-aqt/default.nix        |  6 +++++-
 .../python-modules/cirq-core/default.nix       | 18 ++++--------------
 .../python-modules/cirq-google/default.nix     |  2 ++
 .../python-modules/cirq-ionq/default.nix       |  6 +++++-
 .../python-modules/cirq-pasqal/default.nix     |  6 +++++-
 .../python-modules/cirq-web/default.nix        |  6 +++++-
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/cirq-aqt/default.nix b/pkgs/development/python-modules/cirq-aqt/default.nix
index 58ceb5c600b2..e14be31559b1 100644
--- a/pkgs/development/python-modules/cirq-aqt/default.nix
+++ b/pkgs/development/python-modules/cirq-aqt/default.nix
@@ -2,6 +2,7 @@
   buildPythonPackage,
   cirq-core,
   requests,
+  pytest-benchmark,
   pytestCheckHook,
   setuptools,
 }:
@@ -24,7 +25,10 @@ buildPythonPackage rec {
     requests
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-benchmark
+    pytestCheckHook
+  ];
 
   # cirq's importlib hook doesn't work here
   #pythonImportsCheck = [ "cirq_aqt" ];
diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index 7ebedaaf9686..41adf3d10328 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   setuptools,
@@ -31,6 +30,7 @@
   # tests
   freezegun,
   pytest-asyncio,
+  pytest-benchmark,
   pytestCheckHook,
 
   withContribRequires ? false,
@@ -38,29 +38,18 @@
 
 buildPythonPackage rec {
   pname = "cirq-core";
-  version = "1.6.1";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "quantumlib";
     repo = "cirq";
     tag = "v${version}";
-    hash = "sha256-M+ojGXJOnrBipjSA9hd3++yTS70kCjPru9FG/rm7zI8=";
+    hash = "sha256-OAyBYzMEFyVMlxN5UjrKk1x2rSayLyAIAC5h96JeqK0=";
   };
 
   sourceRoot = "${src.name}/${pname}";
 
-  patches = [
-    # Upstream PR: https://github.com/quantumlib/Cirq/pull/7761
-    (fetchpatch {
-      name = "python-3.14.patch";
-      url = "https://github.com/quantumlib/Cirq/commit/9aea3bad824cac77031c163d6d6f5cf3e01cfe80.patch";
-      stripLen = 1;
-      includes = [ "cirq/ops/linear_combinations_test.py" ];
-      hash = "sha256-Ggcaswrdx6mOfNOwlbWE2ix7aZWt3/Fljb4i1ow+lUU=";
-    })
-  ];
-
   pythonRelaxDeps = [ "matplotlib" ];
 
   build-system = [ setuptools ];
@@ -91,6 +80,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     freezegun
     pytest-asyncio
+    pytest-benchmark
     pytestCheckHook
   ];
 
diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix
index 6737ce491da3..ab706085b038 100644
--- a/pkgs/development/python-modules/cirq-google/default.nix
+++ b/pkgs/development/python-modules/cirq-google/default.nix
@@ -5,6 +5,7 @@
   google-api-core,
   protobuf,
   freezegun,
+  pytest-benchmark,
   pytestCheckHook,
   typedunits,
 }:
@@ -32,6 +33,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     freezegun
+    pytest-benchmark
     pytestCheckHook
   ];
 
diff --git a/pkgs/development/python-modules/cirq-ionq/default.nix b/pkgs/development/python-modules/cirq-ionq/default.nix
index 8522bc23e0e3..21d95a5a7858 100644
--- a/pkgs/development/python-modules/cirq-ionq/default.nix
+++ b/pkgs/development/python-modules/cirq-ionq/default.nix
@@ -2,6 +2,7 @@
   buildPythonPackage,
   cirq-core,
   requests,
+  pytest-benchmark,
   pytestCheckHook,
   setuptools,
 }:
@@ -24,7 +25,10 @@ buildPythonPackage rec {
     requests
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-benchmark
+    pytestCheckHook
+  ];
 
   # cirq's importlib hook doesn't work here
   #pythonImportsCheck = [ "cirq_ionq" ];
diff --git a/pkgs/development/python-modules/cirq-pasqal/default.nix b/pkgs/development/python-modules/cirq-pasqal/default.nix
index db0e5d2455b5..82c792e7772b 100644
--- a/pkgs/development/python-modules/cirq-pasqal/default.nix
+++ b/pkgs/development/python-modules/cirq-pasqal/default.nix
@@ -2,6 +2,7 @@
   buildPythonPackage,
   cirq-core,
   requests,
+  pytest-benchmark,
   pytestCheckHook,
   setuptools,
 }:
@@ -24,7 +25,10 @@ buildPythonPackage rec {
     requests
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-benchmark
+    pytestCheckHook
+  ];
 
   # cirq's importlib hook doesn't work here
   #pythonImportsCheck = [ "cirq_pasqal" ];
diff --git a/pkgs/development/python-modules/cirq-web/default.nix b/pkgs/development/python-modules/cirq-web/default.nix
index 782aec95c4ef..c091bf20eedf 100644
--- a/pkgs/development/python-modules/cirq-web/default.nix
+++ b/pkgs/development/python-modules/cirq-web/default.nix
@@ -1,6 +1,7 @@
 {
   buildPythonPackage,
   cirq-core,
+  pytest-benchmark,
   pytestCheckHook,
   setuptools,
 }:
@@ -16,7 +17,10 @@ buildPythonPackage rec {
 
   dependencies = [ cirq-core ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-benchmark
+    pytestCheckHook
+  ];
 
   # cirq's importlib hook doesn't work here
   #pythonImportsCheck = [ "cirq_web" ];