Merge pull request #24 from chipsalliance/dependencies-bumping-2024-0…

…9-24 Bump to Scala 2.13.15
chipsalliance · Sep 25, 2024 · 4ec415a · 4ec415a
2 parents 10c8064 + fca7db3
commit 4ec415a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/templates/chisel/build.sc b/templates/chisel/build.sc
@@ -13,7 +13,7 @@ import $file.dependencies.chisel.build
 import $file.common
 
 object deps {
-  val scalaVer = "2.13.14"
+  val scalaVer = "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/templates/chisel/nix/gcd/gcd.nix b/templates/chisel/nix/gcd/gcd.nix
@@ -13,7 +13,6 @@
 , circt-full
 , jextract-21
 , add-determinism
-
 , projectDependencies
 
 , target
@@ -44,7 +43,7 @@ let
             root = ./../..;
             fileset = unions [ ./../../build.sc ./../../common.sc ];
           };
-        millDepsHash = "sha256-1PbMBE6VIVCahRUu8gqDPRdW1t0GMWoWbuDfg8HL7A4=";
+        millDepsHash = "sha256-+wfEF4JGRRjPfTue9coK82UzHTsfQvVfuRPQXoZXEag=";
         nativeBuildInputs = [ projectDependencies.setupHook ];
       };
 

diff --git a/templates/chisel/nix/pkgs/dependencies/_sources/generated.json b/templates/chisel/nix/pkgs/dependencies/_sources/generated.json
@@ -1,7 +1,7 @@
 {
     "chisel": {
         "cargoLocks": null,
-        "date": "2024-09-22",
+        "date": "2024-09-24",
         "extract": null,
         "name": "chisel",
         "passthru": null,
@@ -13,10 +13,10 @@
             "name": null,
             "owner": "chipsalliance",
             "repo": "chisel",
-            "rev": "2e4f69fe066da2a7d9edab865cd5328320497b2a",
-            "sha256": "sha256-KCTtD6LO1TGBRo6NHNFMcTazEE/2kJTliSr/Qdtc1sg=",
+            "rev": "9c1829e6afe8a08630c90d5a0f30bce9c487075f",
+            "sha256": "sha256-RWhTiB+sbvvz3aeJHpu4xib8SUE83437B73gWTAQ7nY=",
             "type": "github"
         },
-        "version": "2e4f69fe066da2a7d9edab865cd5328320497b2a"
+        "version": "9c1829e6afe8a08630c90d5a0f30bce9c487075f"
     }
 }
diff --git a/templates/chisel/nix/pkgs/dependencies/_sources/generated.nix b/templates/chisel/nix/pkgs/dependencies/_sources/generated.nix
@@ -3,14 +3,14 @@
 {
   chisel = {
     pname = "chisel";
-    version = "2e4f69fe066da2a7d9edab865cd5328320497b2a";
+    version = "9c1829e6afe8a08630c90d5a0f30bce9c487075f";
     src = fetchFromGitHub {
       owner = "chipsalliance";
       repo = "chisel";
-      rev = "2e4f69fe066da2a7d9edab865cd5328320497b2a";
+      rev = "9c1829e6afe8a08630c90d5a0f30bce9c487075f";
       fetchSubmodules = false;
-      sha256 = "sha256-KCTtD6LO1TGBRo6NHNFMcTazEE/2kJTliSr/Qdtc1sg=";
+      sha256 = "sha256-RWhTiB+sbvvz3aeJHpu4xib8SUE83437B73gWTAQ7nY=";
     };
-    date = "2024-09-22";
+    date = "2024-09-24";
   };
 }