[nix] run nixfmt

Signed-off-by: Avimitin <[email protected]>

Author: Avimitin

Diff for: templates/chisel/flake.nix

@@ -20,7 +20,8 @@
           overlays = [ overlay ];
           inherit system;
         };
-      in {
+      in
+      {
         formatter = pkgs.nixpkgs-fmt;
         legacyPackages = pkgs;
         devShells.default = pkgs.mkShell ({

Diff for: templates/chisel/nix/gcd/default.nix

@@ -3,56 +3,57 @@
 
 { lib, newScope, }:
 lib.makeScope newScope (scope:
-  let
-    designTarget = "GCD";
-    tbTarget = "GCDTestBench";
-    dpiLibName = "gcdemu";
-  in {
-    # RTL
-    gcd-compiled = scope.callPackage ./gcd.nix { target = designTarget; };
-    elaborate = scope.callPackage ./elaborate.nix {
-      elaborator = scope.gcd-compiled.elaborator;
-    };
-    mlirbc = scope.callPackage ./mlirbc.nix { };
-    rtl = scope.callPackage ./rtl.nix { };
+let
+  designTarget = "GCD";
+  tbTarget = "GCDTestBench";
+  dpiLibName = "gcdemu";
+in
+{
+  # RTL
+  gcd-compiled = scope.callPackage ./gcd.nix { target = designTarget; };
+  elaborate = scope.callPackage ./elaborate.nix {
+    elaborator = scope.gcd-compiled.elaborator;
+  };
+  mlirbc = scope.callPackage ./mlirbc.nix { };
+  rtl = scope.callPackage ./rtl.nix { };
 
-    # Testbench
-    tb-compiled = scope.callPackage ./gcd.nix { target = tbTarget; };
-    tb-elaborate = scope.callPackage ./elaborate.nix {
-      elaborator = scope.tb-compiled.elaborator;
-    };
-    tb-mlirbc =
-      scope.callPackage ./mlirbc.nix { elaborate = scope.tb-elaborate; };
-    tb-rtl = scope.callPackage ./rtl.nix { mlirbc = scope.tb-mlirbc; };
-    tb-dpi-lib = scope.callPackage ./dpi-lib.nix { inherit dpiLibName; };
+  # Testbench
+  tb-compiled = scope.callPackage ./gcd.nix { target = tbTarget; };
+  tb-elaborate = scope.callPackage ./elaborate.nix {
+    elaborator = scope.tb-compiled.elaborator;
+  };
+  tb-mlirbc =
+    scope.callPackage ./mlirbc.nix { elaborate = scope.tb-elaborate; };
+  tb-rtl = scope.callPackage ./rtl.nix { mlirbc = scope.tb-mlirbc; };
+  tb-dpi-lib = scope.callPackage ./dpi-lib.nix { inherit dpiLibName; };
 
-    verilated = scope.callPackage ./verilated.nix {
-      rtl = scope.tb-rtl.override { enable-layers = [ "Verification" ]; };
-      dpi-lib = scope.tb-dpi-lib;
-    };
-    verilated-trace = scope.verilated.override {
-      dpi-lib = scope.verilated.dpi-lib.override { enable-trace = true; };
+  verilated = scope.callPackage ./verilated.nix {
+    rtl = scope.tb-rtl.override { enable-layers = [ "Verification" ]; };
+    dpi-lib = scope.tb-dpi-lib;
+  };
+  verilated-trace = scope.verilated.override {
+    dpi-lib = scope.verilated.dpi-lib.override { enable-trace = true; };
+  };
+  vcs = scope.callPackage ./vcs.nix {
+    dpi-lib = scope.tb-dpi-lib.override {
+      sv2023 = false;
+      vpi = true;
     };
-    vcs = scope.callPackage ./vcs.nix {
-      dpi-lib = scope.tb-dpi-lib.override {
-        sv2023 = false;
-        vpi = true;
-      };
-      rtl = scope.tb-rtl.override {
-        enable-layers =
-          [ "Verification" "Verification.Assert" "Verification.Cover" ];
-      };
+    rtl = scope.tb-rtl.override {
+      enable-layers =
+        [ "Verification" "Verification.Assert" "Verification.Cover" ];
     };
-    vcs-trace = scope.vcs.override {
-      dpi-lib = scope.vcs.dpi-lib.override {
-        enable-trace = true;
-        timescale = 1000;
-      };
+  };
+  vcs-trace = scope.vcs.override {
+    dpi-lib = scope.vcs.dpi-lib.override {
+      enable-trace = true;
+      timescale = 1000;
     };
+  };
 
-    # TODO: designConfig should be read from OM
-    tbConfig = with builtins;
-      fromJSON (readFile ./../../configs/${tbTarget}Main.json);
+  # TODO: designConfig should be read from OM
+  tbConfig = with builtins;
+    fromJSON (readFile ./../../configs/${tbTarget}Main.json);
 
-  })
+})
 

Diff for: templates/chisel/nix/gcd/dpi-lib.nix

@@ -1,8 +1,15 @@
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-FileCopyrightText: 2024 Jiuyang Liu <[email protected]>
 
-{ lib, rustPlatform, tbConfig, dpiLibName, sv2023 ? true, vpi ? false
-, enable-trace ? false, timescale ? 1 }:
+{ lib
+, rustPlatform
+, tbConfig
+, dpiLibName
+, sv2023 ? true
+, vpi ? false
+, enable-trace ? false
+, timescale ? 1
+}:
 
 rustPlatform.buildRustPackage rec {
   name = "dpi-lib";

Diff for: templates/chisel/nix/gcd/gcd.nix

@@ -1,14 +1,23 @@
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-FileCopyrightText: 2024 Jiuyang Liu <[email protected]>
 
-{ lib, stdenv, fetchMillDeps, makeWrapper, jdk21
-
-# chisel deps
-, mill, espresso, circt-full, jextract-21, add-determinism
+{ lib
+, stdenv
+, fetchMillDeps
+, makeWrapper
+, jdk21
+
+  # chisel deps
+, mill
+, espresso
+, circt-full
+, jextract-21
+, add-determinism
 
 , projectDependencies
 
-, target }:
+, target
+}:
 
 let
   self = stdenv.mkDerivation rec {
@@ -88,4 +97,5 @@ let
         --add-flags "--enable-preview -Djava.library.path=${circt-full}/lib -cp $out/share/java/elaborator.jar ${mainClass}"
     '';
   };
-in self
+in
+self

Diff for: templates/chisel/nix/gcd/rtl.nix

@@ -1,17 +1,24 @@
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-FileCopyrightText: 2024 Jiuyang Liu <[email protected]>
 
-{ lib, stdenvNoCC, circt, mlirbc, mfcArgs ? [
-  "-O=release"
-  "--split-verilog"
-  "--preserve-values=all"
-  "--lowering-options=verifLabels,omitVersionComment"
-  "--strip-debug-info"
-], enable-layers ? [ ] }:
+{ lib
+, stdenvNoCC
+, circt
+, mlirbc
+, mfcArgs ? [
+    "-O=release"
+    "--split-verilog"
+    "--preserve-values=all"
+    "--lowering-options=verifLabels,omitVersionComment"
+    "--strip-debug-info"
+  ]
+, enable-layers ? [ ]
+}:
 let
   processLayer = lib.map (str: "./" + lib.replaceStrings [ "." ] [ "/" ] str);
   enableLayersDirs = processLayer enable-layers;
-in stdenvNoCC.mkDerivation {
+in
+stdenvNoCC.mkDerivation {
   name = "${mlirbc.name}-rtl";
   nativeBuildInputs = [ circt ];
 

Diff for: templates/chisel/nix/overlay.nix

@@ -3,9 +3,10 @@
 
 final: prev: {
   espresso = final.callPackage ./pkgs/espresso.nix { };
-  mill = let jre = final.jdk21;
-  in (prev.mill.override { inherit jre; }).overrideAttrs
-  (_: { passthru = { inherit jre; }; });
+  mill =
+    let jre = final.jdk21;
+    in (prev.mill.override { inherit jre; }).overrideAttrs
+      (_: { passthru = { inherit jre; }; });
   fetchMillDeps = final.callPackage ./pkgs/mill-builder.nix { };
   circt-full = final.callPackage ./pkgs/circt-full.nix { };
   add-determinism =