style: format entire depot with nixpkgs-fmt r/3723

This CL can be used to compare the style of nixpkgs-fmt against other
formatters (nixpkgs, alejandra).

Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: Profpatsch <mail@profpatsch.de>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: cynthia <cynthia@tvl.fyi>
Reviewed-by: edef <edef@edef.eu>
Reviewed-by: eta <tvl@eta.st>
Reviewed-by: grfn <grfn@gws.fyi>

9 files changed, 157 insertions, 84 deletions

diff --git a/tools/depot-nixpkgs-update.nix b/tools/depot-nixpkgs-update.nix
index 6557b2f25a..c92bc76b62 100644
--- a/tools/depot-nixpkgs-update.nix
+++ b/tools/depot-nixpkgs-update.nix
@@ -11,8 +11,8 @@ let
   archiveUrl = "https://github.com/NixOS/nixpkgs/archive/";
 
   bins = getBins pkgs.nix [ "nix-prefetch-url" ]
-    //   getBins pkgs.curl [ "curl" ]
-    ;
+    // getBins pkgs.curl [ "curl" ]
+  ;
 
 in
 
diff --git a/tools/depot-scanner/default.nix b/tools/depot-scanner/default.nix
index d18034cff0..59b6e53f70 100644
--- a/tools/depot-scanner/default.nix
+++ b/tools/depot-scanner/default.nix
@@ -1,16 +1,18 @@
-{ depot, pkgs, ...}:
+{ depot, pkgs, ... }:
 
 let
   localProto = depot.nix.buildGo.grpc {
     name = "code.tvl.fyi/tools/depot-scanner/proto";
     proto = ./depot_scanner.proto;
   };
-in depot.nix.buildGo.program {
-  name = "depot-scanner";
-  srcs = [
-    ./main.go
-  ];
-  deps = [
-    localProto
-  ];
-} // { inherit localProto; }
+in
+depot.nix.buildGo.program
+  {
+    name = "depot-scanner";
+    srcs = [
+      ./main.go
+    ];
+    deps = [
+      localProto
+    ];
+  } // { inherit localProto; }
diff --git a/tools/depotfmt.nix b/tools/depotfmt.nix
index 8c8e99c089..0be32091b7 100644
--- a/tools/depotfmt.nix
+++ b/tools/depotfmt.nix
@@ -34,7 +34,8 @@ let
       --config-file ${config} \
       --tree-root .
   '';
-in depotfmt.overrideAttrs(_: {
+in
+depotfmt.overrideAttrs (_: {
   passthru.meta.ci.extraSteps.check = {
     label = "depot formatting check";
     command = check;
diff --git a/tools/emacs-pkgs/buildEmacsPackage.nix b/tools/emacs-pkgs/buildEmacsPackage.nix
index 160c062613..990b53b763 100644
--- a/tools/emacs-pkgs/buildEmacsPackage.nix
+++ b/tools/emacs-pkgs/buildEmacsPackage.nix
@@ -16,19 +16,23 @@
 
 buildArgs:
 
-pkgs.callPackage({ emacsPackages }:
+pkgs.callPackage
+  ({ emacsPackages }:
 
-let
-  # Select external dependencies from the emacsPackages set
-  externalDeps = (buildArgs.externalRequires or (_: [])) emacsPackages;
+  let
+    # Select external dependencies from the emacsPackages set
+    externalDeps = (buildArgs.externalRequires or (_: [ ])) emacsPackages;
 
-  # Override emacsPackages for depot-internal packages
-  internalDeps = map (p: p.override { inherit emacsPackages; })
-                     (buildArgs.internalRequires or []);
+    # Override emacsPackages for depot-internal packages
+    internalDeps = map (p: p.override { inherit emacsPackages; })
+      (buildArgs.internalRequires or [ ]);
 
-  trivialBuildArgs = builtins.removeAttrs buildArgs [
-    "externalRequires" "internalRequires"
-  ] // {
-    packageRequires = externalDeps ++ internalDeps;
-  };
-in emacsPackages.trivialBuild trivialBuildArgs) {}
+    trivialBuildArgs = builtins.removeAttrs buildArgs [
+      "externalRequires"
+      "internalRequires"
+    ] // {
+      packageRequires = externalDeps ++ internalDeps;
+    };
+  in
+  emacsPackages.trivialBuild trivialBuildArgs)
+{ }
diff --git a/tools/emacs-pkgs/notable/default.nix b/tools/emacs-pkgs/notable/default.nix
index 8c6935fe88..f57b1c66ae 100644
--- a/tools/emacs-pkgs/notable/default.nix
+++ b/tools/emacs-pkgs/notable/default.nix
@@ -6,7 +6,9 @@ depot.tools.emacs-pkgs.buildEmacsPackage rec {
   src = ./notable.el;
 
   externalRequires = epkgs: with epkgs; [
-    f ht s
+    f
+    ht
+    s
   ];
 
   internalRequires = [
diff --git a/tools/eprintf.nix b/tools/eprintf.nix
index eeacca4c8c..933d73ea71 100644
--- a/tools/eprintf.nix
+++ b/tools/eprintf.nix
@@ -3,7 +3,13 @@
 let
   bins = depot.nix.getBins pkgs.coreutils [ "printf" ];
 
-# printf(1), but redirect to stderr
-in depot.nix.writeExecline "eprintf" {} [
-  "fdmove" "-c" "1" "2" bins.printf "$@"
+  # printf(1), but redirect to stderr
+in
+depot.nix.writeExecline "eprintf" { } [
+  "fdmove"
+  "-c"
+  "1"
+  "2"
+  bins.printf
+  "$@"
 ]
diff --git a/tools/nsfv-setup/default.nix b/tools/nsfv-setup/default.nix
index 98dcc61b7b..1e353e3269 100644
--- a/tools/nsfv-setup/default.nix
+++ b/tools/nsfv-setup/default.nix
@@ -15,7 +15,8 @@
 let
   inherit (pkgs) ripgrep pulseaudio;
   inherit (depot.third_party) nsfv;
-in pkgs.writeShellScriptBin "nsfv-setup" ''
+in
+pkgs.writeShellScriptBin "nsfv-setup" ''
   export PATH="${ripgrep}/bin:${pulseaudio}/bin:$PATH"
 
   if pacmd list-sinks | rg librnnoise_ladspa.so >/dev/null; then
diff --git a/tools/rust-crates-advisory/default.nix b/tools/rust-crates-advisory/default.nix
index c0cd4dc03e..71a51bb1af 100644
--- a/tools/rust-crates-advisory/default.nix
+++ b/tools/rust-crates-advisory/default.nix
@@ -3,81 +3,137 @@
 let
 
   bins =
-       depot.nix.getBins pkgs.s6-portable-utils [ "s6-ln" "s6-cat" "s6-echo" "s6-mkdir" "s6-test" "s6-touch" ]
+    depot.nix.getBins pkgs.s6-portable-utils [ "s6-ln" "s6-cat" "s6-echo" "s6-mkdir" "s6-test" "s6-touch" ]
     // depot.nix.getBins pkgs.lr [ "lr" ]
-    ;
+  ;
 
   crate-advisories = "${depot.third_party.rustsec-advisory-db}/crates";
 
   our-crates = lib.filter (v: v ? outPath)
     (builtins.attrValues depot.third_party.rust-crates);
 
-  check-security-advisory = depot.nix.writers.rustSimple {
-    name = "parse-security-advisory";
-    dependencies = [
-      depot.third_party.rust-crates.toml
-      depot.third_party.rust-crates.semver
-    ];
-  } (builtins.readFile ./check-security-advisory.rs);
+  check-security-advisory = depot.nix.writers.rustSimple
+    {
+      name = "parse-security-advisory";
+      dependencies = [
+        depot.third_party.rust-crates.toml
+        depot.third_party.rust-crates.semver
+      ];
+    }
+    (builtins.readFile ./check-security-advisory.rs);
 
   # $1 is the directory with advisories for crate $2 with version $3
   check-crate-advisory = depot.nix.writeExecline "check-crate-advisory" { readNArgs = 3; } [
-    "pipeline" [ bins.lr "-0" "-t" "depth == 1" "$1" ]
-    "forstdin" "-0" "-Eo" "0" "advisory"
-    "if" [ depot.tools.eprintf "advisory %s\n" "$advisory" ]
-    check-security-advisory "$advisory" "$3"
+    "pipeline"
+    [ bins.lr "-0" "-t" "depth == 1" "$1" ]
+    "forstdin"
+    "-0"
+    "-Eo"
+    "0"
+    "advisory"
+    "if"
+    [ depot.tools.eprintf "advisory %s\n" "$advisory" ]
+    check-security-advisory
+    "$advisory"
+    "$3"
   ];
 
   # Run through everything in the `crate-advisories` repository
   # and check whether we can parse all the advisories without crashing.
-  test-parsing-all-security-advisories = depot.nix.runExecline "check-all-our-crates" {} [
-    "pipeline" [ bins.lr "-0" "-t" "depth == 1" crate-advisories ]
-    "if" [
+  test-parsing-all-security-advisories = depot.nix.runExecline "check-all-our-crates" { } [
+    "pipeline"
+    [ bins.lr "-0" "-t" "depth == 1" crate-advisories ]
+    "if"
+    [
       # this will succeed as long as check-crate-advisory doesn’t `panic!()` (status 101)
-      "forstdin" "-0" "-E" "-x" "101" "crate_advisories"
-      check-crate-advisory "$crate_advisories" "foo" "0.0.0"
+      "forstdin"
+      "-0"
+      "-E"
+      "-x"
+      "101"
+      "crate_advisories"
+      check-crate-advisory
+      "$crate_advisories"
+      "foo"
+      "0.0.0"
     ]
-    "importas" "out" "out"
-    bins.s6-touch "$out"
+    "importas"
+    "out"
+    "out"
+    bins.s6-touch
+    "$out"
   ];
 
 
-  check-all-our-crates = depot.nix.runExecline "check-all-our-crates" {
-    stdin = lib.concatStrings
-      (map
-        (crate:
-          depot.nix.netstring.fromString
-            ( depot.nix.netstring.fromString crate.crateName
-            + depot.nix.netstring.fromString crate.version ))
-        our-crates);
-  } [
-    "if" [
-      "forstdin" "-o" "0" "-Ed" "" "crateNetstring"
-      "multidefine" "-d" "" "$crateNetstring" [ "crate" "crate_version" ]
-      "if" [ depot.tools.eprintf "checking %s, version %s\n" "$crate" "$crate_version" ]
+  check-all-our-crates = depot.nix.runExecline "check-all-our-crates"
+    {
+      stdin = lib.concatStrings
+        (map
+          (crate:
+            depot.nix.netstring.fromString
+              (depot.nix.netstring.fromString crate.crateName
+                + depot.nix.netstring.fromString crate.version))
+          our-crates);
+    } [
+    "if"
+    [
+      "forstdin"
+      "-o"
+      "0"
+      "-Ed"
+      ""
+      "crateNetstring"
+      "multidefine"
+      "-d"
+      ""
+      "$crateNetstring"
+      [ "crate" "crate_version" ]
+      "if"
+      [ depot.tools.eprintf "checking %s, version %s\n" "$crate" "$crate_version" ]
 
-      "ifthenelse" [ bins.s6-test "-d" "${crate-advisories}/\${crate}" ]
-          [ # also print the full advisory text if it matches
-            "export" "PRINT_ADVISORY" "1"
-            check-crate-advisory "${crate-advisories}/\${crate}" "$crate" "$crate_version"
-          ]
-        [ depot.tools.eprintf "No advisories found for crate %s\n" "$crate" ]
-        "importas" "-ui" "ret" "?"
-        # put a marker in ./failed to read at the end
-        "ifelse" [ bins.s6-test "$ret" "-eq" "1" ]
-          [ bins.s6-touch "./failed" ]
-        "if" [ depot.tools.eprintf "\n" ]
-        "exit" "$ret"
-    ]
-    "ifelse" [ bins.s6-test "-f" "./failed" ]
-      [ "if" [ depot.tools.eprintf "Error: Found active advisories!" ]
-        "exit" "1"
+      "ifthenelse"
+      [ bins.s6-test "-d" "${crate-advisories}/\${crate}" ]
+      [
+        # also print the full advisory text if it matches
+        "export"
+        "PRINT_ADVISORY"
+        "1"
+        check-crate-advisory
+        "${crate-advisories}/\${crate}"
+        "$crate"
+        "$crate_version"
       ]
-    "importas" "out" "out"
-    bins.s6-touch "$out"
+      [ depot.tools.eprintf "No advisories found for crate %s\n" "$crate" ]
+      "importas"
+      "-ui"
+      "ret"
+      "?"
+      # put a marker in ./failed to read at the end
+      "ifelse"
+      [ bins.s6-test "$ret" "-eq" "1" ]
+      [ bins.s6-touch "./failed" ]
+      "if"
+      [ depot.tools.eprintf "\n" ]
+      "exit"
+      "$ret"
+    ]
+    "ifelse"
+    [ bins.s6-test "-f" "./failed" ]
+    [
+      "if"
+      [ depot.tools.eprintf "Error: Found active advisories!" ]
+      "exit"
+      "1"
+    ]
+    "importas"
+    "out"
+    "out"
+    bins.s6-touch
+    "$out"
   ];
 
-in depot.nix.readTree.drvTargets {
+in
+depot.nix.readTree.drvTargets {
 
   check-all-our-crates =
     depot.nix.drvSeqL
diff --git a/tools/tvlc/default.nix b/tools/tvlc/default.nix
index f40f30a44e..a6f201485f 100644
--- a/tools/tvlc/default.nix
+++ b/tools/tvlc/default.nix
@@ -43,7 +43,8 @@ let
     '';
   };
 
-in {
+in
+{
   inherit pathScripts;
   inherit commonsh;
   inherit tvlcNew;