diff --git a/build.sc b/build.sc index baad758376..e1d638b444 100644 --- a/build.sc +++ b/build.sc @@ -17,7 +17,7 @@ import $file.dependencies.rvdecoderdb.common import $file.common object v { - val scala = "2.13.12" + val scala = "2.13.14" val mainargs = ivy"com.lihaoyi::mainargs:0.5.0" val json4sJackson = ivy"org.json4s::json4s-jackson:4.0.5" val oslib = ivy"com.lihaoyi::os-lib:0.9.1" diff --git a/flake.lock b/flake.lock index 0b1dc68f3c..f61902b4ff 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ }, "nixpkgs-for-circt": { "locked": { - "lastModified": 1714513019, - "narHash": "sha256-QuNBYQvze8AWpbnH2Dv0dTKzafS10aSwKCFHVIPLsBQ=", + "lastModified": 1715055278, + "narHash": "sha256-nluyASjwNuaDUW5CX3Mo1X0DGDzhE6Mip/ExvRsbeFs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e273473c249f48dfadbf1318056d57f26aa5bf3", + "rev": "9fb582619d1397a8cb64cfe28896a064fa1b33cb", "type": "github" }, "original": { diff --git a/nix/t1/_sources/generated.json b/nix/t1/_sources/generated.json index 9dbaa00bd5..57a34bbb61 100644 --- a/nix/t1/_sources/generated.json +++ b/nix/t1/_sources/generated.json @@ -61,7 +61,7 @@ }, "chisel": { "cargoLocks": null, - "date": "2024-04-30", + "date": "2024-05-06", "extract": null, "name": "chisel", "passthru": null, @@ -73,11 +73,11 @@ "name": null, "owner": "chipsalliance", "repo": "chisel", - "rev": "0cf31392af010dad9ff62ac09f62ba92c1630dbd", - "sha256": "sha256-TFlTwycZDgI2POxVL8o2ID4TSMFLNbRga9cfelBIIIA=", + "rev": "69ec7c2b54a911e3798ad692590fa280d32f42e3", + "sha256": "sha256-EjoDhcqrBDlnQgAZ0iaTI+m3zE8tsvP1KsKU2N+6A7c=", "type": "github" }, - "version": "0cf31392af010dad9ff62ac09f62ba92c1630dbd" + "version": "69ec7c2b54a911e3798ad692590fa280d32f42e3" }, "diplomacy": { "cargoLocks": null, diff --git a/nix/t1/_sources/generated.nix b/nix/t1/_sources/generated.nix index 5f00b83724..f1108b4d5a 100644 --- a/nix/t1/_sources/generated.nix +++ b/nix/t1/_sources/generated.nix @@ -39,15 +39,15 @@ }; chisel = { pname = "chisel"; - version = "0cf31392af010dad9ff62ac09f62ba92c1630dbd"; + version = "69ec7c2b54a911e3798ad692590fa280d32f42e3"; src = fetchFromGitHub { owner = "chipsalliance"; repo = "chisel"; - rev = "0cf31392af010dad9ff62ac09f62ba92c1630dbd"; + rev = "69ec7c2b54a911e3798ad692590fa280d32f42e3"; fetchSubmodules = false; - sha256 = "sha256-TFlTwycZDgI2POxVL8o2ID4TSMFLNbRga9cfelBIIIA="; + sha256 = "sha256-EjoDhcqrBDlnQgAZ0iaTI+m3zE8tsvP1KsKU2N+6A7c="; }; - date = "2024-04-30"; + date = "2024-05-06"; }; diplomacy = { pname = "diplomacy"; diff --git a/nix/t1/t1.nix b/nix/t1/t1.nix index bb126d023c..fe0aa475e3 100644 --- a/nix/t1/t1.nix +++ b/nix/t1/t1.nix @@ -42,7 +42,7 @@ let ./../../common.sc ]; }; - millDepsHash = "sha256-rkS/bTDnjnyzdQyTIhfLj3e0mMdDn4fzv/660rO3qYg="; + millDepsHash = "sha256-ZgcBH7p4/F8Jn6qmsTKmwN6PLVXi37iuRCD0xYxvEO4="; nativeBuildInputs = [ submodules.setupHook ]; };