From cb43406f18acaaa150fc26666334faf323938359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 9 Sep 2025 16:46:29 -0700 Subject: [PATCH 1/2] python312Packages.quil: 0.16.0 -> 0.17.0 Diff: https://github.com/rigetti/quil-rs/compare/quil-py/v0.16.0...quil-py/v0.17.0 Changelog: https://github.com/rigetti/quil-rs/blob/quil-py/v0.17.0/quil-py/CHANGELOG.md --- pkgs/development/python-modules/quil/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/quil/default.nix b/pkgs/development/python-modules/quil/default.nix index b674d3b178ad..24e428d33607 100644 --- a/pkgs/development/python-modules/quil/default.nix +++ b/pkgs/development/python-modules/quil/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "quil"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; # error: the configured Python interpreter version (3.13) is newer than PyO3's maximum supported version (3.12) @@ -21,12 +21,12 @@ buildPythonPackage rec { owner = "rigetti"; repo = "quil-rs"; tag = "quil-py/v${version}"; - hash = "sha256-sj+JjE6y+toIjHO1J2g+3gzQMcfSa6zzQeOySATU48w="; + hash = "sha256-sQvHar52IFVUM+AssPEtBcSGVEma9e909K/5c8H0WQw="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-0KZikbCJgg4prR9XxfCJcZOTiV2Hcob2zLurxqCkH6I="; + hash = "sha256-3qFrsevaVP2tPf0OV0hW6HhhWsj2BM/2sZUvdq1Aa4k="; }; buildAndTestSubdir = "quil-py"; @@ -50,6 +50,10 @@ buildPythonPackage rec { syrupy ]; + pytestFlags = [ + "quil-py/tests_py" + ]; + meta = { changelog = "https://github.com/rigetti/quil-rs/blob/${src.tag}/quil-py/CHANGELOG.md"; description = "Python package for building and parsing Quil programs"; From 607e54ec53641671a80a3e2455ed1f1fa9586ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Sep 2025 23:36:48 -0700 Subject: [PATCH 2/2] python3Packages.cirq-rigetti: drop The cirq-rigetti module was removed from the upstream repo: https://github.com/quantumlib/Cirq/issues/7297 --- .../python-modules/cirq-rigetti/default.nix | 50 ------------------- .../python-modules/cirq/default.nix | 3 -- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 pkgs/development/python-modules/cirq-rigetti/default.nix diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix deleted file mode 100644 index d78ad727a150..000000000000 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - buildPythonPackage, - cirq-core, - setuptools, - pyquil, - qcs-sdk-python, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "cirq-rigetti"; - pyproject = true; - inherit (cirq-core) version src; - - sourceRoot = "${src.name}/${pname}"; - - pythonRelaxDeps = [ - "pyquil" - "qcs-sdk-python" - ]; - - postPatch = '' - # Remove outdated test - rm cirq_rigetti/service_test.py - ''; - - build-system = [ setuptools ]; - - dependencies = [ - cirq-core - pyquil - qcs-sdk-python - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTestPaths = [ - # No need to test the version number - "cirq_rigetti/_version_test.py" - ]; - - # cirq's importlib hook doesn't work here - #pythonImportsCheck = [ "cirq_rigetti" ]; - - meta = { - inherit (cirq-core.meta) changelog license maintainers; - description = "Cirq package to simulate and connect to Rigetti quantum computers and Quil QVM"; - homepage = "https://github.com/quantumlib/Cirq/tree/main/cirq-rigetti"; - }; -} diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 5f74e6ac6762..f5cd8c4eafe7 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -10,7 +10,6 @@ cirq-google, cirq-ionq, cirq-pasqal, - cirq-rigetti, cirq-web, # tests @@ -30,7 +29,6 @@ buildPythonPackage { cirq-google cirq-ionq cirq-pasqal - cirq-rigetti cirq-web ]; @@ -44,7 +42,6 @@ buildPythonPackage { "cirq-google" "cirq-ionq" "cirq-pasqal" - "cirq-rigetti" "cirq-web" "dev_tools" ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a21199a8ef40..ba9e6c971205 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -148,6 +148,7 @@ mapAliases ({ chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 class-registry = phx-class-registry; # added 2021-10-05 cirq-ft = throw "cirq-ft is not longer provieded by cirq upstream"; # added 2024-08-31 + cirq-rigetti = throw "cirq-rigetti was removed because it is no longer provided by upstream"; # added 2025-09-13 ciscoconfparse = throw "ciscoconfparse was archived by upstream, use ciscoconfparse2"; # added 2025-03-08 cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20 clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a86282b1e3e..baf0ccc66dcf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2572,8 +2572,6 @@ self: super: with self; { cirq-pasqal = callPackage ../development/python-modules/cirq-pasqal { }; - cirq-rigetti = callPackage ../development/python-modules/cirq-rigetti { }; - cirq-web = callPackage ../development/python-modules/cirq-web { }; ciscoconfparse2 = callPackage ../development/python-modules/ciscoconfparse2 { };