chore: prepare yosys pybind11 updates

Author: donn

flake.nix

@@ -62,6 +62,7 @@
           self.composePythonOverlay (pkgs': pkgs: pypkgs': pypkgs: let
             callPythonPackage = lib.callPackageWith (pkgs' // pypkgs');
           in {
+            pybind11_3 = callPythonPackage ./nix/pybind11_3.nix {};
             cocotb = callPythonPackage ./nix/cocotb.nix {
               ghdl =
                 if (lib.lists.any (el: el == pkgs'.system) pkgs'.ghdl-bin.meta.platforms)

nix/patches/yosys/abc-editline.patch

@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2025 nix-eda Contributors
+{
+  lib,
+  fetchPypi,
+  buildPythonPackage,
+}:
+buildPythonPackage rec {
+  pname = "pybind11";
+  version = "3.0.1";
+  format = "wheel";
+
+  src = fetchPypi {
+    pname = "pybind11";
+    inherit version;
+    inherit format;
+    dist = "py3";
+    python = "py3";
+    sha256 = "sha256-qo8KpuCpTTtkrfw49WDzPxXlib4hdeEDwKM8a85V7ok=";
+  };
+}

nix/patches/yosys/new-bitwuzla.patch

@@ -22,8 +22,8 @@
   yosys-sby,
   python3,
   makeBinaryWrapper,
-  version ? "0.54",
-  sha256 ? "sha256-Km6layPDTAfd6oWnztJRdbiFkJeVT0YU06xWb/ewAms=",
+  version ? "0.58",
+  sha256 ? "sha256-bYcFIZRUk72mt0dN8wzpC+91nB+Xo0MXG6kmnzYURR4=",
 }:
 yosys.stdenv.mkDerivation (finalAttrs: {
   pname = "yosys-eqy";

nix/patches/yosys/plugin-search-dirs.patch

@@ -19,8 +19,8 @@
   boolector,
   z3,
   yices,
-  version ? "0.54",
-  sha256 ? "sha256-onVeK23KgCodEoaUtfh3R0MraaXuoNuQ2BAX5k4RNis=",
+  version ? "0.58",
+  sha256 ? "sha256-msQ+aqdp8i5KMLUABYU6vA5VBkI6G3zF06RrQzfJucY=",
 }:
 yosys.stdenv.mkDerivation (finalAttrs: {
   pname = "yosys-sby";

nix/pybind11_3.nix

@@ -1,16 +1,5 @@
-# Copyright 2025 nix-eda Contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2025 nix-eda Contributors
 {
   lib,
   yosys,

nix/yosys-eqy.nix

@@ -54,9 +54,11 @@
   libffi,
   zlib,
   fetchurl,
+  fetchGitHubSnapshot,
   bash,
-  version ? "0.54",
-  sha256 ? "sha256-meKlZh6ZiiPHwQCvS7Y667lvE9XWgIaual8c6SDpeDw=",
+  version ? "0.59",
+  rev ? "e86797f0297ef75826cebdd0e6f4cc51b7c77e0a",
+  sha256 ? "sha256-08ZxWgYF+orLX6l97BBdYqAJ13Iq0gSex01Zfd8BPzE=",
   darwin, # To fix codesigning issue for pyosys
   # For environments
   yosys,
@@ -68,7 +70,7 @@
     python = python3;
     enablePython = true;
   };
-  yosys-python3-env = python3.withPackages (ps: with ps; [click setuptools wheel]);
+  yosys-python3-env = python3.withPackages (ps: with ps; [cxxheaderparser pybind11_3 click setuptools wheel]);
   site-packages = yosys-python3-env.sitePackages;
 in let
   self = clangStdenv.mkDerivation (finalAttrs: {
@@ -77,13 +79,30 @@ in let
 
     outputs = ["out" "python"];
 
-    src = fetchurl {
-      url = "https://github.com/YosysHQ/yosys/releases/download/v${version}/yosys.tar.gz";
-      inherit sha256;
-    };
+    src =
+      if rev != null
+      then
+        fetchGitHubSnapshot {
+          owner = "yosyshq";
+          repo = "yosys";
+          inherit rev;
+          hash = sha256;
+        }
+      else
+        fetchurl {
+          url = "https://github.com/YosysHQ/yosys/releases/download/v${version}/yosys.tar.gz";
+          inherit sha256;
+        };
 
     unpackPhase = ''
-      tar -xzvC . -f ${finalAttrs.src}
+      runHook preUnpack
+      if [ -d ${finalAttrs.src} ]; then
+        cp -r ${finalAttrs.src}/* .
+        chmod u+w -R .
+      else
+        tar -xzvC . -f ${finalAttrs.src} --strip-components=1
+      fi
+      runHook postUnpack
     '';
 
     nativeBuildInputs =
@@ -100,7 +119,6 @@ in let
       libbsd
       libffi
       zlib
-      boost-python
     ];
 
     buildInputs = [
@@ -125,15 +143,15 @@ in let
         postBuild = ''
           cat <<SCRIPT > $out/bin/with_yosys_plugin_env
           #!${bash}/bin/bash
-          export NIX_YOSYS_PLUGIN_DIRS='$out/share/yosys/plugins'
+          export YOSYS_PLUGIN_PATH='$out/share/yosys/plugins'
           exec "\$@"
           SCRIPT
           chmod +x $out/bin/with_yosys_plugin_env
           cp $out/bin/yosys $out/bin/yosys_with_plugins
           wrapProgram $out/bin/yosys \
-            --set NIX_YOSYS_PLUGIN_DIRS $out/share/yosys/plugins
+            --suffix YOSYS_PLUGIN_PATH : $out/share/yosys/plugins
           wrapProgram $out/bin/yosys_with_plugins \
-            --set NIX_YOSYS_PLUGIN_DIRS $out/share/yosys/plugins \
+            --suffix YOSYS_PLUGIN_PATH : $out/share/yosys/plugins \
             ${module_flags}
         '';
         inherit (yosys) passthru;
@@ -157,11 +175,6 @@ in let
       "ENABLE_YOSYS=1"
       "ENABLE_PYOSYS=1"
       "PYTHON_DESTDIR=${placeholder "python"}/${site-packages}"
-      "BOOST_PYTHON_LIB=${boost-python}/lib/libboost_${python3.pythonAttr}${clangStdenv.hostPlatform.extensions.sharedLibrary}"
-    ];
-
-    patches = [
-      ./patches/yosys/plugin-search-dirs.patch
     ];
 
     postPatch = ''