From f40fdc43f53b68b367e61b7bf7a152910940cf83 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Wed, 21 May 2025 08:52:11 +0200
Subject: [PATCH 1/4] python3Packages.luna-usb: 0.1.3 -> 0.2.0

---
 pkgs/development/python-modules/luna-usb/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/luna-usb/default.nix b/pkgs/development/python-modules/luna-usb/default.nix
index 4469dea12b5d..7d4da8148302 100644
--- a/pkgs/development/python-modules/luna-usb/default.nix
+++ b/pkgs/development/python-modules/luna-usb/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
 
   # build-system
   setuptools,
@@ -21,15 +20,14 @@
 }:
 buildPythonPackage rec {
   pname = "luna-usb";
-  version = "0.1.3";
+  version = "0.2.0";
   pyproject = true;
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "luna";
     tag = version;
-    hash = "sha256-BKFfEkhgOH0lYfkAE94h27pb+T/uJxKFmMeVJI9I3qg=";
+    hash = "sha256-SVpAPq77IH2/2WZrc25j7q6qTMW2ToPY5lYQcYUlJfs=";
   };
 
   postPatch = ''
@@ -70,6 +68,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/greatscottgadgets/luna";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ carlossless ];
-    broken = lib.versionAtLeast amaranth.version "0.5";
   };
 }

From ed96ad9101a0e3e74dcde8fd8bf81520c0a33b25 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Wed, 21 May 2025 08:52:42 +0200
Subject: [PATCH 2/4] python3Packages.luna-soc: 0.2.2 -> 0.3.2

---
 pkgs/development/python-modules/luna-soc/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/luna-soc/default.nix b/pkgs/development/python-modules/luna-soc/default.nix
index abfccc8e8f83..6501a47440c0 100644
--- a/pkgs/development/python-modules/luna-soc/default.nix
+++ b/pkgs/development/python-modules/luna-soc/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
 
   # build-system
   setuptools,
@@ -13,15 +12,14 @@
 
 buildPythonPackage rec {
   pname = "luna-soc";
-  version = "0.2.2";
+  version = "0.3.2";
   pyproject = true;
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "luna-soc";
     tag = version;
-    hash = "sha256-fP2Pg0H/Aj3nFP0WG1yZjfZMqLutLwmibTohWUbgG34=";
+    hash = "sha256-Rks1wC0CR5FSu4TrE1thzolT3QBd0yh7q+SxZ1U+pB4=";
   };
 
   postPatch = ''

From fd2905b9a8e25b412a28b91c42beeffe9bf24e2f Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Wed, 21 May 2025 08:53:20 +0200
Subject: [PATCH 3/4] python3Packages.cynthion: 0.1.8 -> 0.2.0

---
 pkgs/development/python-modules/cynthion/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/cynthion/default.nix b/pkgs/development/python-modules/cynthion/default.nix
index 53df6a47a08d..a2bf3b2b2c70 100644
--- a/pkgs/development/python-modules/cynthion/default.nix
+++ b/pkgs/development/python-modules/cynthion/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  pythonOlder,
 
   # build-system
   setuptools,
@@ -28,15 +27,14 @@
 }:
 buildPythonPackage rec {
   pname = "cynthion";
-  version = "0.1.8";
+  version = "0.2.0";
   pyproject = true;
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "cynthion";
     tag = version;
-    hash = "sha256-twkCv47Goob2cO7FeHegvab3asf8fqbY9qg97Vw4ZCo=";
+    hash = "sha256-rbvw2eieZwTxStwCRuvIx/f4vdPsOFnV/U80Ga+fNPA=";
   };
 
   sourceRoot = "${src.name}/cynthion/python";
@@ -75,11 +73,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "cynthion" ];
 
   meta = {
-    changelog = "https://github.com/greatscottgadgets/cynthion/releases/tag/${version}";
+    changelog = "https://github.com/greatscottgadgets/cynthion/releases/tag/${src.tag}";
     description = "Python package and utilities for the Great Scott Gadgets Cynthion USB Test Instrument";
     homepage = "https://github.com/greatscottgadgets/cynthion";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ carlossless ];
-    broken = lib.versionAtLeast amaranth.version "0.5";
   };
 }

From c1d715fce65a032123e885024516498277aab2ca Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Wed, 21 May 2025 08:53:51 +0200
Subject: [PATCH 4/4] cynthion: remove amaranth version override

---
 pkgs/by-name/cy/cynthion/package.nix | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/pkgs/by-name/cy/cynthion/package.nix b/pkgs/by-name/cy/cynthion/package.nix
index 70c767cf8ef7..59c1005d8628 100644
--- a/pkgs/by-name/cy/cynthion/package.nix
+++ b/pkgs/by-name/cy/cynthion/package.nix
@@ -1,26 +1,5 @@
 {
   python3,
-  fetchFromGitHub,
 }:
 
-let
-  python = python3.override {
-    self = python3;
-    packageOverrides = _: super: {
-      amaranth = super.amaranth.overridePythonAttrs rec {
-        version = "0.4.1";
-
-        src = fetchFromGitHub {
-          owner = "amaranth-lang";
-          repo = "amaranth";
-          rev = "refs/tags/v${version}";
-          sha256 = "sha256-VMgycvxkphdpWIib7aZwh588En145RgYlG2Zfi6nnDo=";
-        };
-
-        postPatch = null;
-      };
-    };
-  };
-in
-
-python.pkgs.toPythonApplication python.pkgs.cynthion
+python3.pkgs.toPythonApplication python3.pkgs.cynthion