switch to alejandra for nix formatting

autodeps/default.nix

@@ -1,11 +1,14 @@
-{ lib, src, config }:
+{
-let
+  lib,
+  src,
+  config,
+}: let
   inherit (builtins) readFile pathExists attrNames hasAttr;
   inherit (lib) map intersectLists foldl splitString getAttrFromPath;
 
   cargoLockDeps =
-    if pathExists (src + /Cargo.lock) then
+    if pathExists (src + /Cargo.lock)
-      let
+    then let
       cargoLock = fromTOML (readFile (src + /Cargo.lock));
     in
       map (package: package.name) cargoLock.package
@@ -13,15 +16,16 @@ let
   availableAutoDeps = import ./deps.nix;
   detectedDeps = intersectLists cargoLockDeps (attrNames availableAutoDeps);
   mergedDetectedDeps =
-    if config.autodeps then
+    if config.autodeps
+    then
       foldl
       (merged: dep: {
         build = merged.build ++ (availableAutoDeps.${dep}.build or []);
         native = merged.native ++ (availableAutoDeps.${dep}.native or []);
         runtime = merged.runtime ++ (availableAutoDeps.${dep}.runtime or []);
         env =
-            if (hasAttr "env" availableAutoDeps.${dep}) then
+          if (hasAttr "env" availableAutoDeps.${dep})
-              pkgs: (merged.env pkgs) // (availableAutoDeps.${dep}.env pkgs)
+          then pkgs: (merged.env pkgs) // (availableAutoDeps.${dep}.env pkgs)
           else merged.env;
       })
       {
@@ -30,14 +34,14 @@ let
         runtime = [];
         env = pkgs: {};
       }
-        detectedDeps else {
+      detectedDeps
+    else {
       build = [];
       native = [];
       runtime = [];
       env = pkgs: {};
     };
-  getPkgs = pkgs: deps:
+  getPkgs = pkgs: deps: let
-    let
     depPaths = map (splitString ".") deps;
   in
     map (path: getAttrFromPath path pkgs) depPaths;

cargo-meta.nix

@@ -1,5 +1,4 @@
-{ lib }:
+{lib}: let
-let
   inherit (builtins) isAttrs attrNames;
   inherit (lib) assertMsg remove;
 in

crossArgs.nix

@@ -1,27 +1,37 @@
-{ callPackage, pkgsCross, stdenv, lib }:
+{
-let
+  callPackage,
+  pkgsCross,
+  stdenv,
+  lib,
+}: let
   inherit (lib) mapAttrs hasInfix replaceStrings toUpper concatStrings recursiveUpdate;
   isMusl = hasInfix "-musl";
   crossOpts = callPackage ./crossOpts.nix {};
 
-  buildCrossArgs = target: { targetDeps ? [ ]
+  buildCrossArgs = target: {
-                           , rustFlags ? (if isMusl target then "-C target-feature=+crt-static" else "")
+    targetDeps ? [],
-                           , cFlags ? ""
+    rustFlags ? (
-                           , targetStdenv
+      if isMusl target
-                           , ...
+      then "-C target-feature=+crt-static"
-                           } @ args:
+      else ""
-    let
+    ),
+    cFlags ? "",
+    targetStdenv,
+    ...
+  } @ args: let
     isHostTarget = targetStdenv.targetPlatform.config == stdenv.targetPlatform.config;
     # don't use the pkgsCross cc if the target is the host platform
-      targetCc = if isHostTarget then stdenv.cc else targetStdenv.cc;
+    targetCc =
+      if isHostTarget
+      then stdenv.cc
+      else targetStdenv.cc;
     targetUnderscore = replaceStrings ["-"] ["_"] target;
     targetUpperCase = toUpper targetUnderscore;
     rest = removeAttrs args ["rustFlags" "cc" "cFlags" "targetDeps" "targetStdenv" "nativeBuildInputs"];
     # by adding the dependency in the (target specific) linker args instead of buildInputs
     # we can prevent it trying to link to it for host build dependencies
     rustFlagsWithDeps = rustFlags + concatStrings (map (targetDep: " -Clink-arg=-L${targetDep}/lib") targetDeps);
-    in
+  in (
-    (
     {
       nativeBuildInputs = (args.nativeBuildInputs or []) ++ [targetCc stdenv.cc];
       "CARGO_TARGET_${targetUpperCase}_RUSTFLAGS" = rustFlagsWithDeps;
@@ -31,8 +41,8 @@ let
       "CCX_${targetUnderscore}" = "${targetCc.targetPrefix}ccx";
       "HOST_CC" = "${stdenv.cc.targetPrefix}cc";
       "CFLAGS_${targetUnderscore}" = cFlags;
-      } //
+    }
-      rest
+    // rest
   );
 in
   target: buildCrossArgs target crossOpts.${target}

crossOpts.nix

@@ -1,12 +1,15 @@
-{ pkgsCross, perl, callPackage, freebsdCross }:
+{
-let
+  pkgsCross,
+  perl,
+  callPackage,
+  freebsdCross,
+}: let
   freebsdSysrootX86 = callPackage ./freebsd-sysroot.nix {
     arch = "amd64";
     sha256 = "sha256-/XZXt0bPI9bTXrD+TR2KYzhE7wKpVAvKndWL3tqe5cg=";
     version = freebsdCross.versionData.revision;
   };
-in
+in {
-{
   "armv7-unknown-linux-musleabihf" = {
     targetStdenv = pkgsCross.muslpi.stdenv;
   };

flake.nix

@@ -1,7 +1,6 @@
 # mill-scale -- Another rust module for flakelight
 # Copyright (C) 2024 Robin Appelman <robin@icewind.nl>
 # SPDX-License-Identifier: MIT
-
 {
   description = "Another rust module for flakelite";
   inputs = {
@@ -12,8 +11,18 @@
       inputs.nixpkgs.follows = "flakelight/nixpkgs";
     };
   };
-  outputs = { flakelight, crane, rust-overlay, ... }: flakelight ./. {
+  outputs = {
+    flakelight,
+    crane,
+    rust-overlay,
+    ...
+  }:
+    flakelight ./. {
       imports = [flakelight.flakelightModules.flakelightModule];
+      formatters = pkgs:
+        with pkgs; {
+          "*.nix" = pkgs.lib.getExe alejandra;
+        };
       flakelightModule = {lib, ...}: {
         imports = [./mill-scale.nix];
         inputs.crane = lib.mkDefault crane;

freebsd-sysroot.nix

@@ -1,9 +1,9 @@
-{ stdenv
+{
-, fetchzip
+  stdenv,
-, arch
+  fetchzip,
-, version
+  arch,
-, sha256
+  version,
-,
+  sha256,
 }:
 stdenv.mkDerivation {
   pname = "freebsd-sysroot";

mill-scale.nix

@@ -1,15 +1,23 @@
 # mill-scale -- Another rust module for flakelight
 # Copyright (C) 2024 Robin Appelman <robin@icewind.nl>
 # SPDX-License-Identifier: MIT
-
+{
-{ lib, src, config, flakelight, inputs, ... }:
+  lib,
-let
+  src,
+  config,
+  flakelight,
+  inputs,
+  ...
+}: let
   inherit (builtins) elem readFile pathExists isAttrs match any;
-  inherit (lib) map mkDefault mkIf mkMerge mkOption warnIf assertMsg optionalAttrs types optionalString genAttrs hasInfix intersectLists attrVals;
+  inherit (lib) getExe map mkDefault mkIf mkMerge mkOption warnIf assertMsg optionalAttrs types optionalString genAttrs hasInfix intersectLists attrVals;
   inherit (lib.fileset) fileFilter toSource unions;
   inherit (flakelight.types) fileset function optFunctionTo;
 
-  filteredSrc = toSource { root = src; fileset = unions (config.extraPaths ++ [ config.fileset ]); };
+  filteredSrc = toSource {
+    root = src;
+    fileset = unions (config.extraPaths ++ [config.fileset]);
+  };
 
   cargoToml = fromTOML (readFile (src + /Cargo.toml));
   cargoMeta = (import ./cargo-meta.nix {inherit lib;}) cargoToml;
@@ -19,13 +27,16 @@ let
   hasExamples = pathExists (src + /examples);
   hasDefaultPackage = pathExists (src + /nix/package.nix);
 
-  autoDeps = (import ./autodeps { inherit lib src config; });
+  autoDeps = import ./autodeps {inherit lib src config;};
   buildDeps = pkgs: rec {
     buildInputs = (autoDeps pkgs).buildInputs ++ (config.buildInputs pkgs);
     nativeBuildInputs = (autoDeps pkgs).nativeBuildInputs ++ (config.nativeBuildInputs pkgs);
     runtimeInputs = (autoDeps pkgs).runtimeInputs ++ (config.runtimeInputs pkgs);
-    env = (autoDeps pkgs).env // (config.buildEnv pkgs) // {
+    env =
-      LD_LIBRARY_PATH = "/run/opengl-driver/lib/:${lib.makeLibraryPath (runtimeInputs)}";
+      (autoDeps pkgs).env
+      // (config.buildEnv pkgs)
+      // {
+        LD_LIBRARY_PATH = "/run/opengl-driver/lib/:${lib.makeLibraryPath runtimeInputs}";
       };
   };
 in
@@ -46,12 +57,13 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
       };
       fileset = mkOption {
         type = fileset;
-      default = fileFilter
+        default =
+          fileFilter
           (file:
-          file.hasExt "rs" ||
+            file.hasExt "rs"
-          match "snapshot__.*\.snap" file.name != null ||
+            || match "snapshot__.*\.snap" file.name != null
-          elem file.name ([ "Cargo.toml" "Cargo.lock" ] ++ config.extraFiles) ||
+            || elem file.name (["Cargo.toml" "Cargo.lock"] ++ config.extraFiles)
-          any (re: match re file.name != null) config.extraFilesRegex)
+            || any (re: match re file.name != null) config.extraFilesRegex)
           src;
       };
       crossTargets = mkOption {
@@ -104,7 +116,9 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
       };
       miriToolchain = mkOption {
         type = function;
-      default = pkgs: pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {
+        default = pkgs:
+          pkgs.rust-bin.selectLatestNightlyWith (toolchain:
+            toolchain.default.override {
               extensions = ["miri" "rust-src"];
             });
         description = "rust toolchain to use for miri";
@@ -115,23 +129,34 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
       (mkIf (pathExists (src + /Cargo.toml)) {
         withOverlays = [
           (import inputs.rust-overlay)
-        (final: { inputs, rust-bin, writeShellApplication, stdenvNoCC, ... } @ prev: rec {
+          (final: {
-
+              inputs,
+              rust-bin,
+              writeShellApplication,
+              stdenvNoCC,
+              ...
+            } @ prev: rec {
               commonCraneArgs = {
                 src = filteredSrc;
                 strictDeps = true;
                 doCheck = false;
                 inherit ((buildDeps final)) buildInputs nativeBuildInputs;
               };
-          allFeaturesCraneArgs = commonCraneArgs // {
+              allFeaturesCraneArgs =
+                commonCraneArgs
+                // {
                   cargoExtraArgs = "--locked --all-features ${maybeWorkspace}";
                   pname = "${crateName}-all-features";
                 };
-          noDefaultFeaturesCraneArgs = commonCraneArgs // {
+              noDefaultFeaturesCraneArgs =
+                commonCraneArgs
+                // {
                   cargoExtraArgs = "--locked --no-default-features ${maybeWorkspace}";
                   pname = "${crateName}-all-features";
                 };
-          msrvCraneArgs = commonCraneArgs // {
+              msrvCraneArgs =
+                commonCraneArgs
+                // {
                   cargoExtraArgs = "--locked --all-features ${maybeWorkspace}";
                   pname = "${crateName}-msrv";
                 };
@@ -149,22 +174,22 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
               rustToolchain = config.toolchain prev;
               msrvRustToolchain = config.msrvToolchain prev;
               miriRustToolchain = config.miriToolchain prev;
-          cargo-expand = (writeShellApplication {
+              cargo-expand = writeShellApplication {
                 name = "cargo-expand";
                 runtimeInputs = [prev.cargo-expand];
                 text = ''
                   # shellcheck disable=SC2068
                   RUSTC_BOOTSTRAP=1 cargo-expand $@
                 '';
-          });
+              };
-          cargo-miri = (writeShellApplication {
+              cargo-miri = writeShellApplication {
                 name = "cargo-miri";
                 runtimeInputs = [miriRustToolchain];
                 text = ''
                   # shellcheck disable=SC2068
                   cargo miri $@
                 '';
-          });
+              };
             })
         ];
 
@@ -175,30 +200,54 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
 
         pname = tomlPackage.name;
 
-      packages = (optionalAttrs (!hasDefaultPackage) {
+        packages =
-        default = { craneLib, cargoArtifacts, defaultMeta, commonCraneArgs, pkgs }: craneLib.buildPackage (commonCraneArgs // {
+          (optionalAttrs (!hasDefaultPackage) {
+            default = {
+              craneLib,
+              cargoArtifacts,
+              defaultMeta,
+              commonCraneArgs,
+              pkgs,
+            }:
+              craneLib.buildPackage (commonCraneArgs
+                // {
                   inherit cargoArtifacts;
                   meta = defaultMeta;
-        } // (config.packageOpts pkgs));
+                }
-      }) // (genAttrs config.crossTargets (
+                // (config.packageOpts pkgs));
-        target: { craneLibForTargets, cargoArtifacts, defaultMeta, callPackage, crateName, commonCraneArgs, pkgs }:
+          })
-          let
+          // (genAttrs config.crossTargets (
+            target: {
+              craneLibForTargets,
+              cargoArtifacts,
+              defaultMeta,
+              callPackage,
+              crateName,
+              commonCraneArgs,
+              pkgs,
+            }: let
               targetCraneLib = craneLibForTargets [target];
               crossArgs = callPackage ./crossArgs.nix {} target;
             in
               targetCraneLib.buildPackage
-            (commonCraneArgs // {
+              (commonCraneArgs
-              meta = defaultMeta // {
+                // {
+                  meta =
+                    defaultMeta
+                    // {
                       targetPlatform = target;
                       binarySuffix = crossArgs.BINARY_SUFFIX or "";
                     };
                   pname = "${crateName}-${target}";
                   cargoExtraArgs = "--target ${target}";
-            } // crossArgs // (config.packageOpts pkgs))
+                }
+                // crossArgs
+                // (config.packageOpts pkgs))
           ));
 
         outputs = {
-        lib.crossMatrix = map
+          lib.crossMatrix =
+            map
             (target: {
               inherit target;
               binary-suffix = optionalString (hasInfix "windows" target) ".exe";
@@ -206,98 +255,136 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
             config.crossTargets;
         };
 
-      checks =
+        checks = {
-        { craneLib
+          craneLib,
-        , craneLibMsrv
+          craneLibMsrv,
-        , cargoArtifacts
+          cargoArtifacts,
-        , cargoArtifactsMsrv
+          cargoArtifactsMsrv,
-        , cargoArtifactsAllFeatures
+          cargoArtifactsAllFeatures,
-        , cargoArtifactsNoDefault
+          cargoArtifactsNoDefault,
-        , crateName
+          crateName,
-        , commonCraneArgs
+          commonCraneArgs,
-        , allFeaturesCraneArgs
+          allFeaturesCraneArgs,
-        , noDefaultFeaturesCraneArgs
+          noDefaultFeaturesCraneArgs,
-        , msrvCraneArgs
+          msrvCraneArgs,
-        , pkgs
+          pkgs,
-        , ...
+          ...
-        }:
+        }: let
-        let
           packageOpts = config.packageOpts pkgs;
         in
           {
-          test = craneLib.cargoTest (commonCraneArgs // {
+            test = craneLib.cargoTest (commonCraneArgs
+              // {
                 inherit cargoArtifacts;
                 doCheck = true;
                 cargoExtraArgs = "--locked --all-targets ${maybeWorkspace}";
-          } // packageOpts);
+              }
-          clippy = craneLib.cargoClippy (commonCraneArgs // {
+              // packageOpts);
+            clippy = craneLib.cargoClippy (commonCraneArgs
+              // {
                 inherit cargoArtifacts;
                 cargoClippyExtraArgs = "--all-targets -- --deny warnings";
-          } // packageOpts);
+              }
-        } // (optionalAttrs hasMsrv
+              // packageOpts);
+          }
+          // (optionalAttrs hasMsrv
             {
-            msrv = craneLibMsrv.buildPackage
+              msrv =
-              (msrvCraneArgs // {
+                craneLibMsrv.buildPackage
+                (msrvCraneArgs
+                  // {
                     pname = "${crateName}-msrv";
                     cargoArtifacts = cargoArtifactsMsrv;
                     cargoBuildCommand = "cargo check";
                     cargoExtraArgs = "--release --locked --all-targets --all-features ${maybeWorkspace}";
                     installPhaseCommand = "mkdir $out";
-              } // packageOpts);
+                  }
-          }) // (optionalAttrs hasNonDefaultFeatures {
+                  // packageOpts);
-          test-all-features = craneLib.cargoTest (allFeaturesCraneArgs // {
+            })
+          // (optionalAttrs hasNonDefaultFeatures {
+            test-all-features = craneLib.cargoTest (allFeaturesCraneArgs
+              // {
                 cargoArtifacts = cargoArtifactsAllFeatures;
                 doCheck = true;
-          } // packageOpts);
+              }
-          clippy-all-features = craneLib.cargoClippy (allFeaturesCraneArgs // {
+              // packageOpts);
+            clippy-all-features = craneLib.cargoClippy (allFeaturesCraneArgs
+              // {
                 cargoArtifacts = cargoArtifactsAllFeatures;
                 cargoClippyExtraArgs = "--all-targets -- --deny warnings";
-          } // packageOpts);
+              }
-        }) // (optionalAttrs hasDefaultFeatures {
+              // packageOpts);
-          test-no-default-features = craneLib.cargoTest (noDefaultFeaturesCraneArgs // {
+          })
+          // (optionalAttrs hasDefaultFeatures {
+            test-no-default-features = craneLib.cargoTest (noDefaultFeaturesCraneArgs
+              // {
                 cargoArtifacts = cargoArtifactsNoDefault;
                 doCheck = true;
-          } // packageOpts);
+              }
-          clippy-no-default-features = craneLib.cargoClippy (noDefaultFeaturesCraneArgs // {
+              // packageOpts);
+            clippy-no-default-features = craneLib.cargoClippy (noDefaultFeaturesCraneArgs
+              // {
                 cargoArtifacts = cargoArtifactsNoDefault;
                 cargoClippyExtraArgs = "--all-targets -- --deny warnings";
-          } // packageOpts);
+              }
-        }) // (optionalAttrs hasExamples {
+              // packageOpts);
-          examples = craneLibMsrv.buildPackage (commonCraneArgs // {
+          })
+          // (optionalAttrs hasExamples {
+            examples = craneLibMsrv.buildPackage (commonCraneArgs
+              // {
                 pname = "${crateName}-examples";
                 cargoExtraArgs = "--examples ${optionalString hasNonDefaultFeatures "--all-features"} ${maybeWorkspace}";
-          } // packageOpts);
+              }
+              // packageOpts);
           });
 
-      apps = { cargo-miri, cargo-semver-checks, ... }: {
+        apps = {
+          cargo-miri,
+          cargo-semver-checks,
+          ...
+        }: {
           miri = "${cargo-miri}/bin/cargo-miri";
           semver-checks = "${cargo-semver-checks}/bin/cargo-semver-checks semver-checks";
         };
       })
 
       rec {
-      devShells = rec {
+        devShells =
+          rec {
             default = {
-          packages = pkgs: with pkgs; [ rustToolchain ]
+              packages = pkgs:
+                with pkgs;
+                  [rustToolchain]
                   ++ (config.tools pkgs)
                   ++ (buildDeps pkgs).buildInputs
                   ++ (buildDeps pkgs).nativeBuildInputs;
 
-          env = { rustPlatform, pkgs, ... }: {
+              env = {
+                rustPlatform,
+                pkgs,
+                ...
+              }:
+                {
                   RUST_SRC_PATH = toString rustPlatform.rustLibSrc;
-          } // (buildDeps pkgs).env;
+                }
+                // (buildDeps pkgs).env;
             };
             miri = {
-          packages = pkgs: with pkgs; [ miriRustToolchain ]
+              packages = pkgs:
+                with pkgs;
+                  [miriRustToolchain]
                   ++ (config.tools pkgs)
                   ++ (buildDeps pkgs).buildInputs
                   ++ (buildDeps pkgs).nativeBuildInputs;
 
               inherit (default) env;
             };
-      } // (optionalAttrs hasMsrv {
+          }
+          // (optionalAttrs hasMsrv {
             msrv = {
-          packages = pkgs: with pkgs; [ msrvRustToolchain ]
+              packages = pkgs:
+                with pkgs;
+                  [msrvRustToolchain]
                   ++ (config.tools pkgs)
                   ++ (buildDeps pkgs).buildInputs
                   ++ (buildDeps pkgs).nativeBuildInputs;
@@ -306,8 +393,10 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
             };
           });
 
-      formatters = pkgs: {
+        formatters = pkgs:
-        "*.rs" = "${pkgs.rustfmt}/bin/rustfmt";
+          with pkgs; {
+            "*.nix" = getExe alejandra;
+            "*.rs" = getExe rustfmt;
           };
       }
     ];