[nix] use mill-flows overlay in chisel-nix

Signed-off-by: Avimitin <dev@avimit.in>
chipsalliance · Feb 7, 2025 · c646004 · c646004
1 parent b8c675a
commit c646004
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 82 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,17 +4,18 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-for-circt.url = "github:NixOS/nixpkgs/nixos-unstable-small";
+    chisel-nix.url = "github:chipsalliance/chisel-nix";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils, nixpkgs-for-circt }@inputs:
+  outputs = { self, nixpkgs, chisel-nix, flake-utils, nixpkgs-for-circt }@inputs:
     let
       overlay = import ./nix/overlay.nix { inherit self; };
     in
     flake-utils.lib.eachDefaultSystem
       (system:
         let
-          pkgs = import nixpkgs { inherit system; overlays = [ overlay ]; };
+          pkgs = import nixpkgs { inherit system; overlays = [ chisel-nix.overlays.mill-flows overlay ]; };
         in
         {
           legacyPackages = pkgs;

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -32,7 +32,6 @@ rec {
   # DynamoCompiler doesn't support python 3.12+ yet
   buddy-mlir = final.callPackage ./pkgs/buddy-mlir.nix { python3 = final.python311; };
 
-  fetchMillDeps = final.callPackage ./pkgs/mill-builder.nix { };
   circt-full = final.callPackage ./pkgs/circt-full.nix { };
   riscv-vector-test = final.callPackage ./pkgs/riscv-vector-test.nix { };
   add-determinism = final.callPackage ./pkgs/add-determinism { }; # faster strip-undetereminism

diff --git a/nix/pkgs/mill-builder.nix b/nix/pkgs/mill-builder.nix