From d939175ce07bebadd3e2e29a0077c0e7e60416fe Mon Sep 17 00:00:00 2001
From: Mathis Antony <sveitser@gmail.com>
Date: Sat, 25 Nov 2023 17:34:10 +0100
Subject: [PATCH 1/2] pythonPackages.cirq-core: fix build on aarch64

- Skip failing test on aarch64
---
 pkgs/development/python-modules/cirq-core/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index fe6a04480f66..74943c91903b 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -95,6 +95,9 @@ buildPythonPackage rec {
     "test_custom_value_not_implemented"
     # Calibration issue
     "test_xeb_to_calibration_layer"
+  ] ++ lib.optionals stdenv.isAarch64 [
+    # https://github.com/quantumlib/Cirq/issues/5924
+    "test_prepare_two_qubit_state_using_sqrt_iswap"
   ];
 
   meta = with lib; {

From 1de8ec33c5f8432525f3f60ee97d78accda29c9e Mon Sep 17 00:00:00 2001
From: Mathis Antony <sveitser@gmail.com>
Date: Sat, 25 Nov 2023 17:48:08 +0100
Subject: [PATCH 2/2] python3Packages.cirq-core: fix build on aarch64

- Skip failing tests.
- Enable tests that no longer fail.
---
 .../python-modules/cirq-core/default.nix          | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index 74943c91903b..31077bd109e4 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , buildPythonPackage
-, pythonAtLeast
 , pythonOlder
 , fetchFromGitHub
 , duet
@@ -84,18 +83,7 @@ buildPythonPackage rec {
     "cirq/_version_test.py"
   ];
 
-  disabledTests = [
-    # Tries to import flynt, which isn't in Nixpkgs
-    "test_metadata_search_path"
-    # Fails due pandas MultiIndex. Maybe issue with pandas version in nix?
-    "test_benchmark_2q_xeb_fidelities"
-    # https://github.com/quantumlib/Cirq/pull/5991
-    "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"
-  ] ++ lib.optionals stdenv.isAarch64 [
+  disabledTests = lib.optionals stdenv.isAarch64 [
     # https://github.com/quantumlib/Cirq/issues/5924
     "test_prepare_two_qubit_state_using_sqrt_iswap"
   ];
@@ -106,6 +94,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ drewrisinger fab ];
-    broken = (stdenv.isLinux && stdenv.isAarch64);
   };
 }