From 401d06963774d34079b948864e0d2d1a305453ce Mon Sep 17 00:00:00 2001
From: Rowan Goemans <goemansrowan@gmail.com>
Date: Sun, 5 May 2024 05:54:23 +0200
Subject: [PATCH] update yosys

---
 nix/patches/yosys/fix-clang-build.patch | 13 -------------
 nix/yosys-abc.nix                       |  4 ++--
 nix/yosys-eqy.nix                       |  4 ++--
 nix/yosys-sby.nix                       |  4 ++--
 nix/yosys-synlig-sv.nix                 | 10 +++++-----
 nix/yosys.nix                           |  5 ++---
 6 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 nix/patches/yosys/fix-clang-build.patch

diff --git a/nix/patches/yosys/fix-clang-build.patch b/nix/patches/yosys/fix-clang-build.patch
deleted file mode 100644
index f44d60d7e..000000000
--- a/nix/patches/yosys/fix-clang-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 86abc6958..a72f7b792 100644
---- a/Makefile
-+++ b/Makefile
-@@ -187,7 +192,7 @@ endif
- endif
- 
- ifeq ($(CONFIG),clang)
--CXX = clang
-+CXX = clang++
- LD = clang++
- CXXFLAGS += -std=$(CXXSTD) -Os
- ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H"
diff --git a/nix/yosys-abc.nix b/nix/yosys-abc.nix
index 1b1ee59ba..ab01decc5 100644
--- a/nix/yosys-abc.nix
+++ b/nix/yosys-abc.nix
@@ -41,8 +41,8 @@ clangStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "abc";
-    rev = "896e5e7dedf9b9b1459fa019f1fa8aa8101fdf43";
-    sha256 = "sha256-sMBCIV698TIvU/sgTwgPFWDC1kl2TeGv+3pQ06gs7aM=";
+    rev = "03da96f12fb4deb153cc0dc73936df346ecd4bcf";
+    sha256 = "sha256-1VHI03S3POkD+LJzBdnhLy1GPzAcbEzctbUhnUPd21k=";
   };
 
   patches = [
diff --git a/nix/yosys-eqy.nix b/nix/yosys-eqy.nix
index f546cc01e..c85b58a81 100644
--- a/nix/yosys-eqy.nix
+++ b/nix/yosys-eqy.nix
@@ -34,8 +34,8 @@ clangStdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yosyshq";
     repo = "eqy";
-    rev = "5791c90fa6d6076b3c1ff37a3bd65e66f7748230";
-    sha256 = "sha256-zgD8jjtK3pvHxOWvCpFyIuLYsJS5AQMrSARcqjFm9Js=";
+    rev = "eeb03760a9caaf10edff3cfc707a17b20453b7ae";
+    sha256 = "sha256-Xb7mR3J/6AdP87IForJo3dIg2XAklcyyz8EYtNjzxEM=";
   };
 
   makeFlags = [
diff --git a/nix/yosys-sby.nix b/nix/yosys-sby.nix
index 65c17be01..a99bb10b1 100644
--- a/nix/yosys-sby.nix
+++ b/nix/yosys-sby.nix
@@ -29,8 +29,8 @@ yosys.stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "yosyshq";
     repo = "sby";
-    rev = "7415abfcfa8bf14f024f28e61e62f23ccd892415";
-    sha256 = "sha256-+h+Ddv0FYgovu4ee5e6gA+IiD2wThtzFxOMiGkG99g8=";
+    rev = "7dd287f287a4e6ed5ea37026df90276b360482b8";
+    sha256 = "sha256-B5CpS3fXdRv7hDjpNsT1k/287ZLM6dIVCPkf0Cfbb+Y=";
   };
 
   makeFlags = [
diff --git a/nix/yosys-synlig-sv.nix b/nix/yosys-synlig-sv.nix
index 3ef9e10e2..d5024c973 100644
--- a/nix/yosys-synlig-sv.nix
+++ b/nix/yosys-synlig-sv.nix
@@ -27,11 +27,12 @@ clangStdenv.mkDerivation rec {
   dylibs = ["synlig-sv"];
 
   src = fetchFromGitHub {
-    owner = "chipsalliance";
+    owner = "rowanG077";
     repo = "synlig";
-    rev = "fe8f61f1480faa1ea63377c6f60de74e5dca2713";
-    sha256 = "sha256-IBydjoVCYLAb8fNnjgUC1FthScp/CMP17ljCpSEhErU=";
+    rev = "c342ac4ca66fd2dbee5e1122d1a0380a3d13d0ef";
+    sha256 = "sha256-DpXxU+SdP8DybN2yyHlzLk65F50oOt8mxGijGeWyKSM=";
   };
+
   buildInputs = [
     yosys
     yosys.py3env
@@ -51,9 +52,8 @@ clangStdenv.mkDerivation rec {
     ''${ts}.src_dir         := ''$(shell yosys-config --datdir/include)
     ''${ts}.mod_dir         := ''${TOP_DIR}third_party/yosys_mod/
   '';
-  
+
   postPatch = ''
-    sed -i 's/AST::process(design, current_ast,/AST::process(design, current_ast, false,/' frontends/systemverilog/uhdm_common_frontend.cc
     rm third_party/Build.surelog.mk
     cp ${yosys-mk} third_party/Build.yosys.mk
   '';
diff --git a/nix/yosys.nix b/nix/yosys.nix
index 21065b653..889dd5e6e 100644
--- a/nix/yosys.nix
+++ b/nix/yosys.nix
@@ -56,8 +56,8 @@
     src = fetchFromGitHub {
       owner = "YosysHQ";
       repo = "yosys";
-      rev = "543faed9c8cd7c33bbb407577d56e4b7444ba61c";
-      sha256 = "sha256-mzMBhnIEgToez6mGFOvO7zBA+rNivZ9OnLQsjBBDamA=";
+      rev = "0f9ee20ea2c9b377f9b28b862f77b197e6485e00";
+      sha256 = "sha256-gFg17sRAIF+61akeBHSxOU27meNV2/PRHRGMrXSjeMY=";
     };
 
     nativeBuildInputs = [pkg-config bison flex];
@@ -78,7 +78,6 @@
     };
 
     patches = [
-      ./patches/yosys/fix-clang-build.patch
       ./patches/yosys/plugin-search-dirs.patch
     ];