up2date.

Author: kivikakk

flake.lock

@@ -23,7 +23,7 @@
       flake = false;
     };
     abc = {
-      url = github:YosysHQ/abc?rev=0cd90d0d2c5338277d832a1d890bed286486bcf5;
+      url = github:YosysHQ/abc?rev=03da96f12fb4deb153cc0dc73936df346ecd4bcf;
       flake = false;
     };
   };

flake.nix

@@ -37,6 +37,22 @@
 
     doCheck = true;
   };
+
+  pdmBackend =  python.pkgs.buildPythonPackage rec {
+    pname = "pdm_backend";
+    version = "2.2.1";
+    format = "wheel";
+    src = fetchPypi {
+      inherit pname version format;
+      sha256 = "oz+Clcp9gSDviHGLm2hijozKQQJoa+DweDv1hEOZ8pY=";
+      dist = "py3";
+      python = "py3";
+    };
+
+    nativeBuildInputs = [];
+
+    doCheck = true;
+  };
 in
   python.pkgs.buildPythonPackage rec {
     pname = "amaranth";
@@ -46,7 +62,7 @@ in
 
     nativeBuildInputs = [
       git
-      python.pkgs.pdm-backend
+      pdmBackend
     ];
 
     propagatedBuildInputs =
@@ -58,6 +74,7 @@ in
 
     buildInputs = [yosys];
 
+    PDM_BUILD_SCM_VERSION = version;
     AMARANTH_USE_YOSYS = "system";
 
     doCheck = true;

pkgs/amaranth.nix

@@ -43,8 +43,46 @@
 
         pythonImportsCheck = opts.pythonImportsCheck or [name];
 
-        passthru = {
-          inherit devShells;
+        passthru.devShells = {
+          default = self;
+
+          yosys = self.overridePythonAttrs (prev: {
+            # TODO: deduplicate with ../flake.nix's devShells.amaranth-yosys.
+            name = "${name}+yosys";
+            src = null;
+
+            nativeBuildInputs =
+              prev.nativeBuildInputs
+              ++ yosys.nativeBuildInputs
+              ++ [
+                (
+                  if stdenv.isDarwin
+                  then lldb
+                  else gdb
+                )
+                verilog
+              ];
+
+            buildInputs =
+              (prev.buildInputs or [])
+              ++ yosys.buildInputs;
+
+            preShellHook =
+              lib.replaceStrings ["@Makefile.conf.hdx@"] [
+                (yosys.overrideAttrs {
+                  makefileConfPrefix = "$(HDX_OUT)";
+                  extraMakefileConf = ''
+                    ENABLE_DEBUG=1
+                    STRIP=echo hdx: Not doing this: strip
+                  '';
+                })
+                .makefileConf
+              ]
+              (builtins.readFile
+                ../yosys-shell-hook.sh);
+
+            inherit (amaranth) AMARANTH_USE_YOSYS;
+          });
         };
 
         checkPhase = ''
@@ -67,48 +105,6 @@
           env
         '';
       });
-
-    devShells = {
-      default = self;
-
-      yosys = self.overridePythonAttrs (prev: {
-        # TODO: deduplicate with ../flake.nix's devShells.amaranth-yosys.
-        name = "${name}+yosys";
-        src = null;
-
-        nativeBuildInputs =
-          prev.nativeBuildInputs
-          ++ yosys.nativeBuildInputs
-          ++ [
-            (
-              if stdenv.isDarwin
-              then lldb
-              else gdb
-            )
-            verilog
-          ];
-
-        buildInputs =
-          (prev.buildInputs or [])
-          ++ yosys.buildInputs;
-
-        preShellHook =
-          lib.replaceStrings ["@Makefile.conf.hdx@"] [
-            (yosys.overrideAttrs {
-              makefileConfPrefix = "$(HDX_OUT)";
-              extraMakefileConf = ''
-                ENABLE_DEBUG=1
-                STRIP=echo hdx: Not doing this: strip
-              '';
-            })
-            .makefileConf
-          ]
-          (builtins.readFile
-            ../yosys-shell-hook.sh);
-
-        inherit (amaranth) AMARANTH_USE_YOSYS;
-      });
-    };
   in
     self;
 in