diff --git a/build.sc b/build.sc index 42332b5c5..41227cd03 100644 --- a/build.sc +++ b/build.sc @@ -20,7 +20,7 @@ import $file.common def buildSources = T.sources(os.pwd / "build.sc") object v { - val scala = "2.13.14" + val scala = "2.13.15" val mainargs = ivy"com.lihaoyi::mainargs:0.5.0" val oslib = ivy"com.lihaoyi::os-lib:0.9.1" val upickle = ivy"com.lihaoyi::upickle:3.3.1" diff --git a/nix/t1/dependencies/_sources/generated.json b/nix/t1/dependencies/_sources/generated.json index aff1e8df2..7e219724b 100644 --- a/nix/t1/dependencies/_sources/generated.json +++ b/nix/t1/dependencies/_sources/generated.json @@ -41,7 +41,7 @@ }, "chisel": { "cargoLocks": null, - "date": "2024-09-06", + "date": "2024-10-09", "extract": null, "name": "chisel", "passthru": null, @@ -53,11 +53,11 @@ "name": null, "owner": "chipsalliance", "repo": "chisel", - "rev": "fd2ba0c73278e95df5820128062a1de1be6f4cc4", - "sha256": "sha256-oniOTue8NvYx+ypjB/trJzYi1RCEH16AslLlzabsVFY=", + "rev": "ff031b807dbf67c78a6c61d1c7a0de4457a07121", + "sha256": "sha256-jBbIZ45DH2fsH1bnTU/y+CdoJ8Qu/v7r8Q9veu1Zj6g=", "type": "github" }, - "version": "fd2ba0c73278e95df5820128062a1de1be6f4cc4" + "version": "ff031b807dbf67c78a6c61d1c7a0de4457a07121" }, "chisel-interface": { "cargoLocks": null, @@ -119,4 +119,4 @@ }, "version": "6f22826d2c8facb6bf0b41f4bea26a2225751220" } -} \ No newline at end of file +} diff --git a/nix/t1/dependencies/_sources/generated.nix b/nix/t1/dependencies/_sources/generated.nix index 3872e8249..8a987b654 100644 --- a/nix/t1/dependencies/_sources/generated.nix +++ b/nix/t1/dependencies/_sources/generated.nix @@ -27,15 +27,15 @@ }; chisel = { pname = "chisel"; - version = "fd2ba0c73278e95df5820128062a1de1be6f4cc4"; + version = "ff031b807dbf67c78a6c61d1c7a0de4457a07121"; src = fetchFromGitHub { owner = "chipsalliance"; repo = "chisel"; - rev = "fd2ba0c73278e95df5820128062a1de1be6f4cc4"; + rev = "ff031b807dbf67c78a6c61d1c7a0de4457a07121"; fetchSubmodules = false; - sha256 = "sha256-oniOTue8NvYx+ypjB/trJzYi1RCEH16AslLlzabsVFY="; + sha256 = "sha256-jBbIZ45DH2fsH1bnTU/y+CdoJ8Qu/v7r8Q9veu1Zj6g="; }; - date = "2024-09-06"; + date = "2024-10-09"; }; chisel-interface = { pname = "chisel-interface"; diff --git a/nix/t1/mill-modules.nix b/nix/t1/mill-modules.nix index 5575d2e25..058e6690c 100644 --- a/nix/t1/mill-modules.nix +++ b/nix/t1/mill-modules.nix @@ -6,6 +6,7 @@ # chisel deps , mill +, git , espresso , circt-full , jextract-21 @@ -47,7 +48,7 @@ let ./../../.scalafmt.conf ]; }; - millDepsHash = "sha256-gBxEO6pGD0A1RxZW2isjPcHDf+b9Sr++7eq6Ezngiio="; + millDepsHash = "sha256-pixG96IxJsYlgIU+DVxGHky6G5nMfHXphEq5A/xLP7Q="; nativeBuildInputs = [ dependencies.setupHook ]; }; @@ -68,6 +69,7 @@ let jextract-21 add-determinism espresso + git makeWrapper passthru.millDeps.setupHook diff --git a/nix/t1/omreader.nix b/nix/t1/omreader.nix index d10355b83..6e9d496a6 100644 --- a/nix/t1/omreader.nix +++ b/nix/t1/omreader.nix @@ -7,7 +7,7 @@ # chisel deps , mill -, espresso +, git , circt-full , jextract-21 , strip-nondeterminism @@ -36,9 +36,10 @@ let fileset = unions [ ./../../build.sc ./../../common.sc + ./../../.scalafmt.conf ]; }; - millDepsHash = "sha256-ZK3m6VKG3PChoj6U2b6bVd+Z2/xkZrPxqaLRVvj7QgQ="; + millDepsHash = "sha256-pixG96IxJsYlgIU+DVxGHky6G5nMfHXphEq5A/xLP7Q="; nativeBuildInputs = [ dependencies.setupHook ]; }; @@ -68,6 +69,7 @@ let jextract-21 strip-nondeterminism circt-full + git makeWrapper passthru.millDeps.setupHook