[nix] switch back to release version of circt

This reverts commit 7cc9d10.
chipsalliance · Jul 16, 2024 · cc373d9 · cc373d9
1 parent 936f3d3
commit cc373d9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 96 deletions.
diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -14,27 +14,7 @@ rec {
 
   # Override "nixpkgs" circt with "nixpkgs-for-circt".
   # To update the "nixpkgs-for-circt" input, run `nix flake lock --update-input nixpkgs-for-circt`.
-  circt = self.inputs.nixpkgs-for-circt.legacyPackages."${final.system}".circt.overrideAttrs (old: rec {
-    version = "nightly";
-    src = final.fetchFromGitHub {
-      owner = "llvm";
-      repo = "circt";
-      rev = "1f6c29fb6465877d86c65d9ac2c6eeaa8f1e9044";
-      sha256 = "sha256-1tfClDKtVAp8j0+Aku5+2QTriqmsr3sjIReg7ekKZx0=";
-      fetchSubmodules = true;
-    };
-    preConfigure = ''
-      find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${final.coreutils}/bin/env|g' {} \;
-      substituteInPlace cmake/modules/GenVersionFile.cmake --replace "unknown git version" "nightly"
-    '';
-    patches = [
-      (final.fetchpatch {
-        url = "https://patch-diff.githubusercontent.com/raw/llvm/circt/pull/7210.diff";
-        sha256 = "sha256-eAWIcBgn+TDfZN/mi2IdoKNa9j6In864lTu88rFv2/o=";
-      })
-      ./pkgs/revert-llvm-bump.patch
-    ];
-  });
+  circt = self.inputs.nixpkgs-for-circt.legacyPackages."${final.system}".circt;
   espresso = final.callPackage ./pkgs/espresso.nix { };
   dramsim3 = final.callPackage ./pkgs/dramsim3.nix { };
   libspike = final.callPackage ./pkgs/libspike.nix { };

diff --git a/nix/pkgs/revert-llvm-bump.patch b/nix/pkgs/revert-llvm-bump.patch
diff --git a/nix/t1/_sources/generated.json b/nix/t1/_sources/generated.json
@@ -61,7 +61,7 @@
     },
     "chisel": {
         "cargoLocks": null,
-        "date": "2024-07-04",
+        "date": "2024-06-20",
         "extract": null,
         "name": "chisel",
         "passthru": null,
@@ -73,11 +73,11 @@
             "name": null,
             "owner": "chipsalliance",
             "repo": "chisel",
-            "rev": "b5fdc91dd2ec53afbb5c626835d8799baeffc4eb",
-            "sha256": "sha256-5McfF4y0Yrd32oelGYITAtcUjz+ddnubs2rCaa0iyTI=",
+            "rev": "0baa8fdf9b3688236d81797f5105bed45e06bdb5",
+            "sha256": "sha256-EQnlT4aB5XPa+fDTosVEHMjC/MhcC3I7cnfv0Ixzcx8=",
             "type": "github"
         },
-        "version": "b5fdc91dd2ec53afbb5c626835d8799baeffc4eb"
+        "version": "0baa8fdf9b3688236d81797f5105bed45e06bdb5"
     },
     "chisel-interface": {
         "cargoLocks": null,

diff --git a/nix/t1/_sources/generated.nix b/nix/t1/_sources/generated.nix
@@ -39,15 +39,15 @@
   };
   chisel = {
     pname = "chisel";
-    version = "b5fdc91dd2ec53afbb5c626835d8799baeffc4eb";
+    version = "0baa8fdf9b3688236d81797f5105bed45e06bdb5";
     src = fetchFromGitHub {
       owner = "chipsalliance";
       repo = "chisel";
-      rev = "b5fdc91dd2ec53afbb5c626835d8799baeffc4eb";
+      rev = "0baa8fdf9b3688236d81797f5105bed45e06bdb5";
       fetchSubmodules = false;
-      sha256 = "sha256-5McfF4y0Yrd32oelGYITAtcUjz+ddnubs2rCaa0iyTI=";
+      sha256 = "sha256-EQnlT4aB5XPa+fDTosVEHMjC/MhcC3I7cnfv0Ixzcx8=";
     };
-    date = "2024-07-04";
+    date = "2024-06-20";
   };
   chisel-interface = {
     pname = "chisel-interface";

diff --git a/nix/t1/nvfetcher.toml b/nix/t1/nvfetcher.toml
@@ -35,7 +35,7 @@ fetch.github = "chipsalliance/rocket-chip-inclusive-cache"
 
 [chisel]
 src.git = "https://github.com/chipsalliance/chisel"
-src.branch = "sequencer/t1"
+src.branch = "main"
 fetch.github = "chipsalliance/chisel"
 
 [chisel-interface]