chore: update yosys (+ plugins) to 0.60 (#42)

Signed-off-by: Leo Moser <[email protected]>
Co-authored-by: Leo Moser <[email protected]>

Author: donn

.github/workflows/ci.yml

@@ -8,31 +8,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          [
+        os: [
             {
               name: "Ubuntu 24.04",
               family: "linux",
               runner: "ubuntu-24.04",
               archs: "x86_64",
+              nix_double: "x86_64-linux",
             },
             {
               name: "Ubuntu 22.04",
               family: "linux",
               runner: "ubuntu-22.04-arm",
               archs: "aarch64",
+              nix_double: "aarch64-linux",
             },
             {
               name: "macOS 15",
               family: "macos",
-              runner: "macos-15-intel",
+              runner: "macos-15", # with rosetta
               archs: "x86_64",
+              nix_double: "x86_64-darwin",
             },
             {
               name: "macOS 15",
               family: "macos",
               runner: "macos-15",
               archs: "arm64",
+              nix_double: "aarch64-darwin",
             },
           ]
     name: Nix Builds | ${{ matrix.os.name }} | ${{ matrix.os.archs }}
@@ -48,7 +51,7 @@ jobs:
       - id: enumerate_packages
         name: Get all packages
         run: |
-          echo "FLAKE_OUTPUTS=$(python3 ./.github/workflows/get_all_packages.py | tr '\n' ' ')" >> $GITHUB_ENV
+          echo "FLAKE_OUTPUTS=$(python3 ./.github/workflows/get_all_packages.py ${{ matrix.os.nix_double }} | tr '\n' ' ')" >> $GITHUB_ENV
       - name: Build All
         run: |
           set +e

.github/workflows/get_all_packages.py

@@ -17,8 +17,11 @@ def run(purpose, *args):
         exit(-1)
     return process.stdout
 
+system = tuple()
+if len(sys.argv) > 1:
+    system = ("--system", sys.argv[1])
 
-flake_meta = json.load(run("get flake metadata", "nix", "flake", "show", "--json"))
+flake_meta = json.load(run("get flake metadata", "nix", "flake", "show", *system, "--json"))
 packages = flake_meta["packages"]
 for platform, packages in packages.items():
     for package, package_info in packages.items():

nix/fetch_github_snapshot.nix

@@ -30,6 +30,7 @@
   repo,
   rev,
   hash,
+  add-gitcommit ? false,
 }:
 stdenvNoCC.mkDerivation {
   name = "github-${repo}-${rev}-snapshot";
@@ -45,7 +46,7 @@ stdenvNoCC.mkDerivation {
   phases = [ "installPhase" ];
   installPhase = ''
     python3 ${./supporting/download_github_snapshot.py} \
-      --out-dir $out \
+      ${lib.optionalString add-gitcommit "--add-gitcommit"} --out-dir $out \
       https://github.com/${owner}/${repo} \
       ${rev}
   '';

nix/supporting/download_github_snapshot.py

@@ -130,7 +130,13 @@ def extract_tarball(tarball_path: str, extract_to: str):
             tar.extract(member, path=extract_to, filter="tar")
 
 
-def fetch_tarball_and_submodules(repo_url, commit, base_path=None, filter="."):
+def fetch_tarball_and_submodules(
+    repo_url,
+    commit,
+    base_path=None,
+    filter=".",
+    add_gitcommit=False,
+):
     if base_path is None:
         base_path = urllib.parse.urlsplit(repo_url).path.split("/")[-1]
     key = (repo_url, commit)
@@ -155,6 +161,10 @@ def fetch_tarball_and_submodules(repo_url, commit, base_path=None, filter="."):
     tree_resp.raise_for_status()
     tree_data = tree_resp.json()
 
+    if add_gitcommit:
+        with open(os.path.join(base_path, ".gitcommit"), "w") as f:
+            f.write(tree_data["sha"])
+
     submodules = {
         item["path"]: item["sha"]
         for item in tree_data.get("tree", [])
@@ -215,6 +225,7 @@ def fetch_tarball_and_submodules(repo_url, commit, base_path=None, filter="."):
             commit=sha,
             base_path=sub_path,
             filter=filter,
+            add_gitcommit=add_gitcommit,
         )
 
     with open(
@@ -238,9 +249,15 @@ def fetch_tarball_and_submodules(repo_url, commit, base_path=None, filter="."):
     default=".",
     help="Regex to match submodule paths. Submodules that are not matched will be excluded.",
 )
+@click.option(
+    "--add-gitcommit",
+    default=False,
+    is_flag=True,
+    help="Adds a .gitcommit file containing the commit sha256 of each resolved tree",
+)
 @click.argument("repo_url")
 @click.argument("commit")
-def main(repo_url, commit, out_dir, filter):
+def main(repo_url, commit, out_dir, filter, add_gitcommit):
     """
     Downloads a snapshot of a GitHub repo, i.e. with all GitHub-based submodules
     recursively downloaded.
@@ -254,6 +271,7 @@ def main(repo_url, commit, out_dir, filter):
         commit=commit,
         base_path=out_dir,
         filter=filter,
+        add_gitcommit=add_gitcommit,
     )
 
 

nix/yosys-eqy.nix

@@ -30,8 +30,8 @@
   yosys-sby,
   python3,
   makeBinaryWrapper,
-  version ? "0.59",
-  sha256 ? "sha256-dDDU3ld4e3CcqLzCwcV+AU2C8ZNFStRLpqlD3fIfdMw=",
+  version ? "0.60",
+  sha256 ? "sha256-XSN7Flw6uU0SEhAX5pMWIsxxZaBKBjyjR+JKUwdSxw4=",
 }:
 yosys.stdenv.mkDerivation (finalAttrs: {
   pname = "yosys-eqy";

nix/yosys-sby.nix

@@ -28,8 +28,8 @@
   boolector,
   z3,
   yices,
-  version ? "0.59",
-  sha256 ? "sha256-WNJ390nN2+vjWGIc842e/5CX2wKI/cyo+NnuCfbHSbQ=",
+  version ? "0.60",
+  sha256 ? "sha256-REK5ZS5iExSlqNazdUCXVJzaXtkPxJweyXro3azrC/8=",
 }:
 yosys.stdenv.mkDerivation (finalAttrs: {
   pname = "yosys-sby";

nix/yosys-slang.nix

@@ -26,9 +26,9 @@
   cmake,
   fmt,
   jq,
-  rev ? "76b83eb5b73ba871797e6db7bc5fed10af380be4",
-  rev-date ? "2025-06-20",
-  hash ? "sha256-XqBnrwH1C+oxfbIFFUS1s8Ujbcr1VDWHq8FVyL9iGOI=",
+  rev ? "d4053e825408a25dc2c065cd430b4cc5e71b1b6c",
+  rev-date ? "2025-12-08",
+  hash ? "sha256-lSulYjGoW3ngRwKgQg8KdzWanrMos/w2NeqpFr+kkI4=",
 }:
 clang18Stdenv.mkDerivation {
   name = "yosys-slang";

nix/yosys.nix

@@ -39,9 +39,9 @@
   fetchurl,
   fetchGitHubSnapshot,
   bash,
-  version ? "0.59.1",
+  version ? "0.60",
   rev ? null,
-  sha256 ? "sha256-XUQu07i6kBR745OZU/UQTwGbRt/uZHKpBNRrcUP87Bo=",
+  sha256 ? "sha256-JKxNdc3AXE1IaodM5eg0t3PkkGsnIwFpIbN9Gj56G/k=",
   darwin, # To fix codesigning issue for pyosys
   # For environments
   yosys,
@@ -78,6 +78,7 @@ let
           repo = "yosys";
           inherit rev;
           hash = sha256;
+          add-gitcommit = true;
         }
       else
         fetchurl {
@@ -152,14 +153,14 @@ let
     unpackPhase = ''
       runHook preUnpack
       if [ -d ${finalAttrs.src} ]; then
-        cp -r ${finalAttrs.src}/* .
+        cp -r ${finalAttrs.src}/* ${finalAttrs.src}/.* .
         chmod u+w -R .
       else
         tar -xzC . -f ${finalAttrs.src}
       fi
       runHook postUnpack
     '';
-    
+
     configurePhase = ''
       runHook preConfigure
       CC=clang CXX=clang++ make config-clang