Running nixpkgs-update (https://nix-community.org/update-bot/) with UPDATE_INFO: circt 0 -> 1 attrpath: circt Checking auto update branch... [version] [version] skipping because derivation has updateScript [rustCrateVersion] [rustCrateVersion] No cargoHash found [golangModuleVersion] [golangModuleVersion] Not a buildGoModule package with vendorHash [npmDepsVersion] [npmDepsVersion] No npmDepsHash [updateScript] [updateScript] Success [updateScript] this derivation will be built: /nix/store/vh4miyi2183kk0kxb0975p8rb9jkr5cg-packages.json.drv building '/nix/store/vh4miyi2183kk0kxb0975p8rb9jkr5cg-packages.json.drv'... Going to be running update for following packages: - circt-1.140.0 Press Enter key to continue... Running update for: Enqueuing group of 1 packages - circt-1.140.0: UPDATING ... - circt-1.140.0: DONE. Packages updated! Diff after rewrites: diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index f855bf648c17..8c29284035bf 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -27,12 +27,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "circt"; - version = "1.140.0"; + version = "1.149.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; tag = "firtool-${finalAttrs.version}"; - hash = "sha256-oitdYNGsEyraQqouOt9srfbDgVGFOAGZMdcf/rjnx5Q="; + hash = "sha256-3YsYxQ/YE8bdnSQ1gMT/fgE9BHfCe4Z+jgA8tIWS5LE="; fetchSubmodules = true; }; No auto update branch exists Old version 1.140.0" not present in master derivation file with contents: { stdenv, lib, cmake, coreutils, python3, git, fetchFromGitHub, ninja, lit, z3, sv-lang_10, # update sv-lang version here according to upstream requirements fmt, boost, mimalloc, gitUpdater, callPackage, versionCheckHook, # sv-lang (slang) build is broken on darwin enableSlangFrontend ? stdenv.hostPlatform.isLinux, }: let pythonEnv = python3.withPackages (ps: [ ps.psutil ]); circt-llvm = callPackage ./circt-llvm.nix { }; in stdenv.mkDerivation (finalAttrs: { pname = "circt"; version = "1.147.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; tag = "firtool-${finalAttrs.version}"; hash = "sha256-rtnvahI7EzUJXE80X3XPWjjDD/6f9BPmZ7S97Lstuhw="; fetchSubmodules = true; }; requiredSystemFeatures = [ "big-parallel" ]; __structuredAttrs = true; nativeBuildInputs = [ cmake ninja git pythonEnv z3 versionCheckHook ]; buildInputs = [ circt-llvm ] ++ lib.optionals enableSlangFrontend [ boost fmt mimalloc sv-lang_10 ]; cmakeFlags = [ # Based on .github/workflows/buildAndTest.yml:211 (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "LLVM_ENABLE_ASSERTIONS" false) (lib.cmakeFeature "MLIR_DIR" "${circt-llvm.dev}/lib/cmake/mlir") (lib.cmakeFeature "LLVM_DIR" "${circt-llvm.dev}/lib/cmake/llvm") # LLVM_EXTERNAL_LIT is executed by python3, the wrapped bash script will not work (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${lit}/bin/.lit-wrapped") (lib.cmakeBool "CIRCT_SLANG_FRONTEND_ENABLED" enableSlangFrontend) (lib.cmakeBool "CIRCT_SLANG_BUILD_FROM_SOURCE" false) ]; # cannot use lib.optionalString as it creates an empty string, disabling all tests env.LIT_FILTER_OUT = let lit-filters = # There are some tests depending on `clang-tools` to work. They are activated only when detected # `clang-tidy` in PATH, However, we cannot simply put `clang-tools` in checkInputs to make these # tests work. Because # # 1. The absolute paths of binaries used in tests are resolved in configure phase. # 2. When stdenv = clangStdenv, the `clang-tidy` binary appears in PATH via `clang-unwrapped`, # which is always placed before `${clang-tools}/bin` in PATH. `clang-tidy` provided in # `clang-unwrapped` cause tests failing because it is not wrapped to resolve header search paths. # https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue. # # As a temporary fix, we disabled these tests when using clang stdenv lib.optionals stdenv.cc.isClang [ "CIRCT :: Target/ExportSystemC/.*\\.mlir" ] # Disable some tests on x86_64-darwin ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ # These test seem to pass on hydra (rosetta) but not on x86_64-darwin machines "CIRCT :: Target/ExportSMTLIB/.*\\.mlir" "CIRCT :: circt-bmc/.*\\.mlir" # These tests were having issues on rosetta "CIRCT :: Dialect/.*/Reduction/.*\\.mlir" "CIRCT :: Dialect/SMT/.*\\.mlir" "CIRCT :: circt-as-dis/.*\\.mlir" "CIRCT :: circt-reduce/.*\\.mlir" "CIRCT :: circt-test/basic.mlir" "CIRCT :: firld/.*\\.mlir" "CIRCT :: Tools/domaintool/clock-spec-json.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 # Replace slang references to match the package in nixpkgs substituteInPlace \ lib/Tools/circt-verilog-lsp-server/VerilogServerImpl/CMakeLists.txt \ lib/Conversion/ImportVerilog/CMakeLists.txt \ unittests/Conversion/ImportVerilog/CMakeLists.txt \ --replace-fail "slang_slang" "slang::slang" # Patch shebang in test mlir files 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. # So this hard codes the version. substituteInPlace cmake/modules/GenVersionFile.cmake \ --replace-fail "unknown git version" "${finalAttrs.src.rev}" # Increase timeout on tests because some were failing on hydra. # Using `replace-warn` so it doesn't break when upstream changes the timeout. substituteInPlace integration_test/CMakeLists.txt \ --replace-warn 'set(CIRCT_INTEGRATION_TIMEOUT 60)' 'set(CIRCT_INTEGRATION_TIMEOUT 300)' ''; doCheck = true; checkTarget = "check-circt check-circt-unit"; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/firtool"; versionCheckProgramArg = "--version"; outputs = [ "out" "lib" "dev" ]; # Copy circt-llvm's postFixup stage so that it can make all our dylib references # absolute as well. # # We don't need `postPatch` because circt seems to be automatically inheriting # the config somehow, presumably via. `-DMLIR_DIR`. postFixup = circt-llvm.postFixup; postInstall = '' moveToOutput lib "$lib" moveToOutput lib/cmake "$dev" substituteInPlace $dev/lib/cmake/circt/CIRCTConfig.cmake \ --replace-fail "\''${CIRCT_INSTALL_PREFIX}/lib/cmake/mlir" "${circt-llvm.dev}/lib/cmake/mlir" \ --replace-fail "\''${CIRCT_INSTALL_PREFIX}/lib/cmake/circt" "$dev/lib/cmake/circt" \ --replace-fail "\''${CIRCT_INSTALL_PREFIX}/include" "$dev/include" \ --replace-fail "\''${CIRCT_INSTALL_PREFIX}/lib" "$lib/lib" \ --replace-fail "\''${CIRCT_INSTALL_PREFIX}/bin" "$out/bin" \ --replace-fail "\''${CIRCT_INSTALL_PREFIX}" "$out" substituteInPlace $dev/lib/cmake/circt/CIRCTTargets-release.cmake \ --replace-fail "\''${_IMPORT_PREFIX}/lib" "$lib/lib" ''; passthru = { updateScript = gitUpdater { rev-prefix = "firtool-"; }; llvm = circt-llvm; }; meta = { description = "Circuit IR compilers and tools"; homepage = "https://circt.org/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ sharzy pineapplehunter sequencer ]; platforms = lib.platforms.all; }; })