Skip to content

Commit 1731706

Browse files
Avimitinsequencer
authored andcommitted
[nix] update chisel-interface mill infra
Signed-off-by: Avimitin <[email protected]>
1 parent 04886c9 commit 1731706

10 files changed

+9149
-74
lines changed

flake.lock

+27-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,23 @@
33

44
inputs = {
55
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
6-
chisel-nix.url = "github:chipsalliance/chisel-nix";
76
nixpkgs-for-circt.url = "github:NixOS/nixpkgs/nixos-unstable-small";
87
flake-utils.url = "github:numtide/flake-utils";
8+
mill-ivy-fetcher = {
9+
url = "github:Avimitin/mill-ivy-fetcher";
10+
inputs.nixpkgs.follows = "nixpkgs";
11+
inputs.flake-utils.follows = "flake-utils";
12+
};
913
};
1014

11-
outputs = { self, nixpkgs, chisel-nix, flake-utils, nixpkgs-for-circt }@inputs:
15+
outputs = { self, nixpkgs, mill-ivy-fetcher, flake-utils, nixpkgs-for-circt }@inputs:
1216
let
1317
overlay = import ./nix/overlay.nix { inherit self; };
1418
in
1519
flake-utils.lib.eachDefaultSystem
1620
(system:
1721
let
18-
pkgs = import nixpkgs { inherit system; overlays = [ chisel-nix.overlays.mill-flows overlay ]; };
22+
pkgs = import nixpkgs { inherit system; overlays = [ mill-ivy-fetcher.overlays.default overlay ]; };
1923
in
2024
{
2125
legacyPackages = pkgs;

nix/_sources/generated.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"chisel": {
33
"cargoLocks": null,
4-
"date": "2025-01-25",
4+
"date": "2025-03-19",
55
"extract": null,
66
"name": "chisel",
77
"passthru": null,
@@ -13,10 +13,10 @@
1313
"name": null,
1414
"owner": "chipsalliance",
1515
"repo": "chisel",
16-
"rev": "8a1f1b66e5e87dff6c8356fae346eb46512756cf",
17-
"sha256": "sha256-pB8kzqUmvHTG2FqRRjqig1FK9pGYrgBDOOekCqkwrsE=",
16+
"rev": "8ca43912a43bba06d2627a22520618019c1710f9",
17+
"sha256": "sha256-c0Q2Uf+MYORqvqzja4Er53h/RNOUVVm2bReMfTjiwp8=",
1818
"type": "github"
1919
},
20-
"version": "8a1f1b66e5e87dff6c8356fae346eb46512756cf"
20+
"version": "8ca43912a43bba06d2627a22520618019c1710f9"
2121
}
2222
}

nix/_sources/generated.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
{
44
chisel = {
55
pname = "chisel";
6-
version = "8a1f1b66e5e87dff6c8356fae346eb46512756cf";
6+
version = "8ca43912a43bba06d2627a22520618019c1710f9";
77
src = fetchFromGitHub {
88
owner = "chipsalliance";
99
repo = "chisel";
10-
rev = "8a1f1b66e5e87dff6c8356fae346eb46512756cf";
10+
rev = "8ca43912a43bba06d2627a22520618019c1710f9";
1111
fetchSubmodules = false;
12-
sha256 = "sha256-pB8kzqUmvHTG2FqRRjqig1FK9pGYrgBDOOekCqkwrsE=";
12+
sha256 = "sha256-c0Q2Uf+MYORqvqzja4Er53h/RNOUVVm2bReMfTjiwp8=";
1313
};
14-
date = "2025-01-25";
14+
date = "2025-03-19";
1515
};
1616
}

nix/bump-lock.nix

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{ writeShellApplication
2+
, mill
3+
, mill-ivy-fetcher
4+
, submodules
5+
}:
6+
writeShellApplication {
7+
name = "bump-chisel-interface";
8+
9+
runtimeInputs = [
10+
mill-ivy-fetcher
11+
mill
12+
];
13+
14+
text = ''
15+
chiselDir=$(mktemp -d -t 'chisel_src_XXX')
16+
cp -rT ${submodules.sources.chisel.src} "$chiselDir"/chisel
17+
chmod -R u+w "$chiselDir"/chisel
18+
19+
mif run -p "$chiselDir"/chisel -o ./nix/chisel-mill-lock.nix
20+
21+
ivyLocal=$(nix build '.#chisel-snapshot' --no-link --print-out-paths -L -j auto)
22+
export JAVA_TOOL_OPTIONS="''${JAVA_TOOL_OPTIONS:-} -Dcoursier.ivy.home=$ivyLocal -Divy.home=$ivyLocal"
23+
mif run \
24+
--targets 'dwbb[snapshot]' \
25+
--targets 'jtag[snapshot]' \
26+
--targets 'axi4[snapshot]' \
27+
-o ./nix/chisel-interface-mill-lock.nix
28+
'';
29+
}

0 commit comments

Comments
 (0)