build: bump to Scala 2.13.15

Signed-off-by: unlsycn <[email protected]>
chipsalliance · Oct 10, 2024 · 3acacd4 · 3acacd4
1 parent d6f3d9b
commit 3acacd4
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git 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
@@ -41,7 +41,7 @@
     },
     "chisel": {
         "cargoLocks": null,
-        "date": "2024-09-06",
+        "date": "2024-10-09",
         "extract": null,
         "name": "chisel",
         "passthru": null,
@@ -53,15 +53,15 @@
             "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,
-        "date": "2024-06-17",
+        "date": "2024-08-12",
         "extract": null,
         "name": "chisel-interface",
         "passthru": null,
@@ -73,11 +73,11 @@
             "name": null,
             "owner": "chipsalliance",
             "repo": "chisel-interface",
-            "rev": "79703e44fb6010a535e6750249f6be0471fa0046",
-            "sha256": "sha256-1VTN2OfsauJvf+JM/j0uhvixD0+aCnyGOoO74YrCFPA=",
+            "rev": "9f42edc9d5ada43962fe65d3a2ed6db21763641a",
+            "sha256": "sha256-KbkXEDhv1MTj51/3e7EQEy9JCQ0mbbKu84hufVXmoEk=",
             "type": "github"
         },
-        "version": "79703e44fb6010a535e6750249f6be0471fa0046"
+        "version": "9f42edc9d5ada43962fe65d3a2ed6db21763641a"
     },
     "riscv-opcodes": {
         "cargoLocks": null,

diff --git a/nix/t1/dependencies/_sources/generated.nix b/nix/t1/dependencies/_sources/generated.nix
@@ -27,27 +27,27 @@
   };
   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";
-    version = "79703e44fb6010a535e6750249f6be0471fa0046";
+    version = "9f42edc9d5ada43962fe65d3a2ed6db21763641a";
     src = fetchFromGitHub {
       owner = "chipsalliance";
       repo = "chisel-interface";
-      rev = "79703e44fb6010a535e6750249f6be0471fa0046";
+      rev = "9f42edc9d5ada43962fe65d3a2ed6db21763641a";
       fetchSubmodules = false;
-      sha256 = "sha256-1VTN2OfsauJvf+JM/j0uhvixD0+aCnyGOoO74YrCFPA=";
+      sha256 = "sha256-KbkXEDhv1MTj51/3e7EQEy9JCQ0mbbKu84hufVXmoEk=";
     };
-    date = "2024-06-17";
+    date = "2024-08-12";
   };
   riscv-opcodes = {
     pname = "riscv-opcodes";

diff --git 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
@@ -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 ];
     };