From 75dc360a03d2a7d06910b8a82912edd4d0e4a09b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 18 Oct 2024 17:28:56 +0200
Subject: [PATCH 1/3] python312Packages.amaranth: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix
index bac25d70f040..e79be265ba46 100644
--- a/pkgs/development/python-modules/amaranth/default.nix
+++ b/pkgs/development/python-modules/amaranth/default.nix
@@ -21,20 +21,18 @@
 buildPythonPackage rec {
   pname = "amaranth";
   format = "pyproject";
-  version = "0.5.2";
+  version = "0.5.3";
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "amaranth-lang";
     repo = "amaranth";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pf9X1B60FgqTbSw7D80ERHp4GCvCe5lqrlS96xPXLNo=";
+    hash = "sha256-lPQw7fAVM7URdyC/9c/UIYsRxVXrLjvHODvhYBdlkkg=";
   };
 
-  nativeBuildInputs = [
-    git
-    pdm-backend
-  ];
+  nativeBuildInputs = [ git ];
+  build-system = [ pdm-backend ];
 
   dependencies =
     [

From 50c9e0ee1702b1d4a127fc05120bc6d088536f06 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 18 Oct 2024 17:29:19 +0200
Subject: [PATCH 2/3] python312Packages.amaranth-soc: 0.1a-unstable-2024-06-10
 -> 0.1a-unstable-2024-10-12

---
 .../python-modules/amaranth-soc/default.nix    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix
index 597a1829161f..a33128a376d1 100644
--- a/pkgs/development/python-modules/amaranth-soc/default.nix
+++ b/pkgs/development/python-modules/amaranth-soc/default.nix
@@ -9,22 +9,24 @@
 
 buildPythonPackage rec {
   pname = "amaranth-soc";
-  version = "0.1a-unstable-2024-06-10";
+  version = "0.1a-unstable-2024-10-12";
   pyproject = true;
   # from `pdm show`
-  realVersion = let
-     tag = builtins.elemAt (lib.splitString "-" version) 0;
-     rev = lib.substring 0 7 src.rev;
-    in "${tag}1.dev1+g${rev}";
+  realVersion =
+    let
+      tag = builtins.elemAt (lib.splitString "-" version) 0;
+      rev = lib.substring 0 7 src.rev;
+    in
+    "${tag}1.dev1+g${rev}";
 
   src = fetchFromGitHub {
     owner = "amaranth-lang";
     repo = "amaranth-soc";
-    rev = "e1b842800533f44924f21c3867bc2290084d100f";
-    hash = "sha256-GAGQEncONY566v8hLjGeZ7CRlOt36vHg+0a5xcB+g1Y=";
+    rev = "5c43cf58f15d9cd9c69ff83c97997708d386b2dc";
+    hash = "sha256-o9xjH/nmV7ovw6bQ6PaFGLcjz5gDGb+eQ9eGNRPnBV8=";
   };
 
-  nativeBuildInputs = [ pdm-backend ];
+  build-system = [ pdm-backend ];
   dependencies = [ amaranth ];
 
   preBuild = ''

From 6b1750e42972aec2c82c5a72064b1559e4a3d4e1 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 18 Oct 2024 17:29:37 +0200
Subject: [PATCH 3/3] python312Packages.amaranth-boards: 0-unstable-2024-05-01
 -> 0-unstable-2024-10-18

---
 .../amaranth-boards/default.nix               | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix
index a010d3570b7c..cfd76b23a8ad 100644
--- a/pkgs/development/python-modules/amaranth-boards/default.nix
+++ b/pkgs/development/python-modules/amaranth-boards/default.nix
@@ -3,38 +3,36 @@
   buildPythonPackage,
   fetchFromGitHub,
   amaranth,
-  setuptools,
-  setuptools-scm,
+  pdm-backend,
   unstableGitUpdater,
 }:
 
 buildPythonPackage rec {
   pname = "amaranth-boards";
-  version = "0-unstable-2024-05-01";
+  version = "0-unstable-2024-10-18";
   pyproject = true;
-  # python setup.py --version
-  realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}";
+  # from `pdm show`
+  realVersion =
+    let
+      tag = builtins.elemAt (lib.splitString "-" version) 0;
+      rev = lib.substring 0 7 src.rev;
+    in
+    "${tag}1.dev1+g${rev}";
 
   src = fetchFromGitHub {
     owner = "amaranth-lang";
     repo = "amaranth-boards";
-    rev = "aba2300dc83216523e1c98fdb22471cb4bac5027";
+    rev = "23c66d68045831de0a372c8c237274d74c71ef4e";
     # these files change depending on git branch status
     postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes";
-    hash = "sha256-jldXyMJtuSGcZKmtwpZBYrR/UBe4ufblPYRYpBmReM8=";
+    hash = "sha256-cC7uvj9+6h3RPbFdu3/T1t/jhw5CuLOF8aKwDSkRE54=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    setuptools-scm
-  ];
-  dependencies = [
-    setuptools
-    amaranth
-  ];
+  build-system = [ pdm-backend ];
+  dependencies = [ amaranth ];
 
   preBuild = ''
-    export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
+    export PDM_BUILD_SCM_VERSION="${realVersion}"
   '';
 
   # no tests