From f49cab22afd63f4e01dadd5a69601ccb001f79d6 Mon Sep 17 00:00:00 2001 From: unlsycn Date: Tue, 17 Dec 2024 09:36:19 +0000 Subject: [PATCH] circt: 1.87.0 -> 1.98.0 Signed-off-by: unlsycn --- pkgs/by-name/ci/circt/package.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 9ea6dad79b34..042b90c6f51f 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.87.0"; + version = "1.98.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-buWpoym57YxyHJySYaektAUmuSRXMS+YBwtjWpoV1Vg="; + hash = "sha256-wkaspxwWJ7xJVQ+VZ9Z85zbzOcLAb3v55EJQjd+jiw8="; fetchSubmodules = true; }; @@ -75,10 +75,20 @@ stdenv.mkDerivation rec { "CIRCT :: circt-as-dis/.*\\.mlir" "CIRCT :: circt-reduce/.*\\.mlir" "CIRCT :: circt-test/basic.mlir" + ] + ++ [ + # Temporarily disable for bump: https://github.com/llvm/circt/issues/8000 + "CIRCT :: Dialect/FIRRTL/SFCTests/ExtractSeqMems/Compose.fir" + "CIRCT :: Dialect/FIRRTL/SFCTests/ExtractSeqMems/Simple2.fir" + "CIRCT :: Dialect/FIRRTL/extract-instances.mlir" ]; in if lit-filters != [ ] then lib.strings.concatStringsSep "|" lit-filters else null; + postPatch = '' + patchShebangs tools/circt-test + ''; + preConfigure = '' find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \; # circt uses git to check its version, but when cloned on nix it can't access git.