style: Switch to nixfmt from nixpkgs-fmt

Most of the ecosystem has moved to this formatter,
and many people configured their editors to autoformat it with this formatter.

Closes: https://git.snix.dev/snix/snix/issues/62
Change-Id: Icf39e7836c91fc2ae49fbe22a40a639105bfb0bd
Reviewed-on: https://cl.snix.dev/c/snix/+/30671
Reviewed-by: Florian Klink <flokli@flokli.de>
Tested-by: besadii
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>

tools/checks/default.nix

@@ -13,21 +13,21 @@ in
   validateTerraform =
     {
       # Environment name to use (inconsequential, only for drv name)
-      name ? "main"
-    , # Terraform package to use. Should be pre-configured with the
+      name ? "main",
+      # Terraform package to use. Should be pre-configured with the
       # correct providers.
-      terraform ? pkgs.terraform
-    , # Source path for Terraform configuration. Be careful about
+      terraform ? pkgs.terraform,
+      # Source path for Terraform configuration. Be careful about
       # relative imports. Use the 'subDir' parameter to optionally cd
       # into a subdirectory of source, e.g. if there is a flat structure
       # with modules.
-      src
-    , # Sub-directory of $src from which to run the check. Useful in
+      src,
+      # Sub-directory of $src from which to run the check. Useful in
       # case of relative Terraform imports from a code tree
-      subDir ? "."
-    , # Environment variables to pass to Terraform. Necessary in case of
+      subDir ? ".",
+      # Environment variables to pass to Terraform. Necessary in case of
       # dummy environment variables that need to be set.
-      env ? { }
+      env ? { },
     }:
     pkgs.runCommand "tf-validate-${sanitizeDerivationName name}" env ''
       cp -r ${src}/* . && chmod -R u+w .

tools/crfo-approve.nix

@@ -22,7 +22,12 @@ pkgs.writeShellScriptBin "crfo-approve" ''
     exit 1
   fi
 
-  export PATH="${pkgs.lib.makeBinPath [ pkgs.httpie pkgs.jq ]}:''${PATH}"
+  export PATH="${
+    pkgs.lib.makeBinPath [
+      pkgs.httpie
+      pkgs.jq
+    ]
+  }:''${PATH}"
 
   readonly CL_ID="''${1}"
   readonly PATCHSET="''${2}"

tools/depot-deps.nix

@@ -9,7 +9,7 @@ depot.nix.lazy-deps {
   gerrit.attr = "tools.gerrit-cli";
   mg.attr = "tools.magrathea";
   niv.attr = "third_party.nixpkgs.niv";
-  nixpkgs-fmt.attr = "third_party.nixpkgs.nixpkgs-fmt";
+  nixfmt.attr = "third_party.nixpkgs.nixfmt";
 
   tf-buildkite = {
     attr = "ops.buildkite.terraform";

tools/depotfmt.nix

@@ -10,10 +10,11 @@ let
     includes = ["*.go"]
 
     [formatter.nix]
-    command = "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt"
+    command = "${pkgs.nixfmt}/bin/nixfmt"
     includes = [ "*.nix" ]
     excludes = [
       "snix/eval/src/tests/nix_tests/*",
+      "snix/eval/src/tests/snix_tests/*"
     ]
 
     [formatter.rust]

tools/magrathea/default.nix

@@ -20,7 +20,10 @@ stdenv.mkDerivation {
   src = ./.;
   dontInstall = true;
 
-  nativeBuildInputs = [ chicken makeWrapper ];
+  nativeBuildInputs = [
+    chicken
+    makeWrapper
+  ];
   buildInputs = with chickenPackages.chickenEggs; [
     matchable
     srfi-13

tools/releases/default.nix

@@ -1,5 +1,10 @@
 # Definitions for simple release mechanisms from depot.
-{ depot, lib, pkgs, ... }:
+{
+  depot,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
   inherit (lib.strings) makeBinPath sanitizeDerivationName;
@@ -10,28 +15,39 @@ in
   #
   # This expects, of course, that the remote repository has granted
   # push access to the CI SSH key.
-  filteredGitPush = { filter, remote, ref ? "refs/heads/canon" }: {
-    label = ":git: push '${filter}' to external git repository";
-    branches = [ "refs/heads/canon" ];
-    phase = "release";
+  filteredGitPush =
+    {
+      filter,
+      remote,
+      ref ? "refs/heads/canon",
+    }:
+    {
+      label = ":git: push '${filter}' to external git repository";
+      branches = [ "refs/heads/canon" ];
+      phase = "release";
 
-    command = pkgs.writeShellScript "${sanitizeDerivationName filter}-push" ''
-      set -e
-      export PATH="${makeBinPath [ pkgs.git pkgs.josh ]}:$PATH"
+      command = pkgs.writeShellScript "${sanitizeDerivationName filter}-push" ''
+        set -e
+        export PATH="${
+          makeBinPath [
+            pkgs.git
+            pkgs.josh
+          ]
+        }:$PATH"
 
-      echo 'Filtering depot through ${filter}'
-      josh-filter '${filter}'
+        echo 'Filtering depot through ${filter}'
+        josh-filter '${filter}'
 
-      echo 'Fetching remote to check if a push is needed'
-      git fetch '${remote}' '${ref}'
+        echo 'Fetching remote to check if a push is needed'
+        git fetch '${remote}' '${ref}'
 
-      if git merge-base --is-ancestor FILTERED_HEAD FETCH_HEAD; then
-        echo 'Commit already present, nothing to push.'
-        exit 0
-      fi
+        if git merge-base --is-ancestor FILTERED_HEAD FETCH_HEAD; then
+          echo 'Commit already present, nothing to push.'
+          exit 0
+        fi
 
-      echo 'Pushing filtered repository to ${remote}:${ref}'
-      git push '${remote}' 'FILTERED_HEAD:${ref}'
-    '';
-  };
+        echo 'Pushing filtered repository to ${remote}:${ref}'
+        git push '${remote}' 'FILTERED_HEAD:${ref}'
+      '';
+    };
 }

tools/rust-crates-advisory/default.nix

@@ -1,19 +1,22 @@
-{ depot, pkgs, lib, ... }:
+{
+  depot,
+  pkgs,
+  lib,
+  ...
+}:
 
 let
-  our-crates = lib.filter (v: v ? outPath)
-    (builtins.attrValues depot.third_party.rust-crates);
+  our-crates = lib.filter (v: v ? outPath) (builtins.attrValues depot.third_party.rust-crates);
 
-  our-crates-lock-file = pkgs.writeText "our-crates-Cargo.lock"
-    (lib.concatMapStrings
-      (crate: ''
-        [[package]]
-        name = "${crate.crateName}"
-        version = "${crate.version}"
-        source = "registry+https://github.com/rust-lang/crates.io-index"
+  our-crates-lock-file = pkgs.writeText "our-crates-Cargo.lock" (
+    lib.concatMapStrings (crate: ''
+      [[package]]
+      name = "${crate.crateName}"
+      version = "${crate.version}"
+      source = "registry+https://github.com/rust-lang/crates.io-index"
 
-      '')
-      our-crates);
+    '') our-crates
+  );
 
   lock-file-report = pkgs.writers.writeBash "lock-file-report" ''
     set -u
@@ -66,9 +69,10 @@ let
   '';
 
   buildkiteReportStep =
-    { command
-    , context ? null
-    , style ? "warning"
+    {
+      command,
+      context ? null,
+      style ? "warning",
     }:
     let
       commandName = depot.nix.utils.storePathName (builtins.head command);
@@ -82,13 +86,16 @@ let
       if test $? -ne 0; then
          printf "%s" "$report" | \
          buildkite-agent annotate ${
-           lib.escapeShellArgs ([
-             "--style"
-             style
-           ] ++ lib.optionals (context != null) [
-             "--context"
-             context
-           ])
+           lib.escapeShellArgs (
+             [
+               "--style"
+               style
+             ]
+             ++ lib.optionals (context != null) [
+               "--context"
+               context
+             ]
+           )
          }
       fi
     '';