From aa122cbae78ce97d60c0c98ba14df753d97e40b1 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 30 Jan 2022 19:06:58 +0300
Subject: style: format entire depot with nixpkgs-fmt

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>
---
 third_party/abseil_cpp/default.nix                 | 16 +++---
 third_party/agenix/default.nix                     |  3 +-
 third_party/arion/default.nix                      | 14 +++---
 third_party/bat_syntaxes/default.nix               |  3 +-
 third_party/cgit/default.nix                       |  3 +-
 third_party/clj2nix/default.nix                    |  3 +-
 third_party/default.nix                            | 55 ++++++++++----------
 third_party/dhall/default.nix                      | 13 +++--
 third_party/elmPackages_0_18/default.nix           | 14 +++---
 third_party/gerrit_plugins/builder.nix             | 58 +++++++++++-----------
 third_party/gerrit_plugins/default.nix             |  3 +-
 third_party/gerrit_plugins/oauth/default.nix       |  3 +-
 third_party/git/default.nix                        |  4 +-
 third_party/gitignoreSource/default.nix            | 17 ++++---
 .../github.com/charmbracelet/bubbletea/default.nix | 10 ++--
 third_party/grpc/default.nix                       |  2 +-
 third_party/gtest/default.nix                      |  2 +-
 third_party/josh/default.nix                       | 12 +++--
 third_party/lisp/bordeaux-threads.nix              |  3 +-
 third_party/lisp/cl-fad.nix                        |  4 +-
 third_party/lisp/cl-json.nix                       | 23 +++++----
 third_party/lisp/cl-plus-ssl.nix                   | 14 +++---
 third_party/lisp/cl-unicode.nix                    |  6 +--
 third_party/lisp/cl-yacc.nix                       |  6 ++-
 third_party/lisp/closure-common.nix                | 11 ++--
 third_party/lisp/easy-routes.nix                   |  3 +-
 third_party/lisp/flexi-streams.nix                 |  2 +-
 third_party/lisp/global-vars.nix                   |  2 +-
 third_party/lisp/hunchentoot.nix                   |  5 +-
 third_party/lisp/ironclad.nix                      |  5 +-
 third_party/lisp/lass.nix                          |  3 +-
 third_party/lisp/lisp-binary.nix                   | 16 +++---
 third_party/lisp/local-time.nix                    |  3 +-
 third_party/lisp/nibbles.nix                       |  3 +-
 third_party/lisp/postmodern.nix                    |  3 +-
 third_party/lisp/routes.nix                        |  3 +-
 third_party/lisp/s-xml/default.nix                 | 18 ++++---
 third_party/lisp/trivial-ldap.nix                  |  6 ++-
 third_party/lisp/trivial-mimes.nix                 |  5 +-
 third_party/lisp/uax-15.nix                        |  5 +-
 third_party/lisp/unix-opts.nix                     |  2 +-
 third_party/lisp/usocket-server.nix                |  3 +-
 third_party/lisp/usocket.nix                       |  3 +-
 third_party/naersk/default.nix                     | 14 +++---
 third_party/nix/corepkgs/buildenv.nix              | 12 +++--
 third_party/nix/corepkgs/derivation.nix            |  9 ++--
 third_party/nix/corepkgs/fetchurl.nix              | 19 ++++---
 .../nix/corepkgs/imported-drv-to-derivation.nix    | 13 +++--
 third_party/nix/default.nix                        | 58 ++++++++++++----------
 third_party/nix/test-vm.nix                        |  3 +-
 third_party/nixery/default.nix                     |  3 +-
 third_party/nixpkgs/default.nix                    |  9 ++--
 third_party/overlays/emacs.nix                     |  3 +-
 third_party/overlays/haskell/default.nix           |  3 +-
 third_party/overlays/tvl.nix                       | 10 ++--
 .../prometheus-fail2ban-exporter/default.nix       |  3 +-
 third_party/python/broadlink/default.nix           |  3 +-
 third_party/rust-crates/default.nix                | 22 ++++----
 third_party/rustsec-advisory-db/default.nix        |  2 +-
 59 files changed, 327 insertions(+), 251 deletions(-)

(limited to 'third_party')

diff --git a/third_party/abseil_cpp/default.nix b/third_party/abseil_cpp/default.nix
index 66ab4f6ba143..dd3ca9de9de1 100644
--- a/third_party/abseil_cpp/default.nix
+++ b/third_party/abseil_cpp/default.nix
@@ -8,7 +8,7 @@ in pkgs.abseil-cpp.override {
 
 /* TODO(tazjin): update abseil subtree
 
-fullLlvm11Stdenv.mkDerivation rec {
+  fullLlvm11Stdenv.mkDerivation rec {
   pname = "abseil-cpp";
   version = "20200519-768eb2ca+tvl-1";
   src = ./.;
@@ -17,15 +17,15 @@ fullLlvm11Stdenv.mkDerivation rec {
   # doCheck = true;
 
   cmakeFlags = [
-    "-DCMAKE_CXX_STANDARD=17"
-    #"-DABSL_RUN_TESTS=1"
+  "-DCMAKE_CXX_STANDARD=17"
+  #"-DABSL_RUN_TESTS=1"
   ];
 
   meta = with lib; {
-    description = "An open-source collection of C++ code designed to augment the C++ standard library";
-    homepage = https://abseil.io/;
-    license = licenses.asl20;
-    maintainers = [ maintainers.andersk ];
+  description = "An open-source collection of C++ code designed to augment the C++ standard library";
+  homepage = https://abseil.io/;
+  license = licenses.asl20;
+  maintainers = [ maintainers.andersk ];
   };
-}
+  }
 */
diff --git a/third_party/agenix/default.nix b/third_party/agenix/default.nix
index 91fd9576b091..96afbe16994a 100644
--- a/third_party/agenix/default.nix
+++ b/third_party/agenix/default.nix
@@ -9,7 +9,8 @@ let
   agenix = import src {
     inherit pkgs;
   };
-in {
+in
+{
   inherit src;
   cli = agenix.agenix;
 }
diff --git a/third_party/arion/default.nix b/third_party/arion/default.nix
index 16cd92ea3f48..7b0aa4ee334a 100644
--- a/third_party/arion/default.nix
+++ b/third_party/arion/default.nix
@@ -1,8 +1,10 @@
 { pkgs, ... }:
 
-(import (pkgs.fetchFromGitHub {
-  owner = "hercules-ci";
-  repo = "arion";
-  rev = "db6d4d7490dff363de60cebbece3ae9361e3ce43";
-  sha256 = "0d8nqmc7fjshigax2g47ips262v8ml27x0ksq59kmprgb7ckzi5l";
-}) { inherit pkgs; }).arion
+(import
+  (pkgs.fetchFromGitHub {
+    owner = "hercules-ci";
+    repo = "arion";
+    rev = "db6d4d7490dff363de60cebbece3ae9361e3ce43";
+    sha256 = "0d8nqmc7fjshigax2g47ips262v8ml27x0ksq59kmprgb7ckzi5l";
+  })
+  { inherit pkgs; }).arion
diff --git a/third_party/bat_syntaxes/default.nix b/third_party/bat_syntaxes/default.nix
index 2b7d025fae57..a48962dd364d 100644
--- a/third_party/bat_syntaxes/default.nix
+++ b/third_party/bat_syntaxes/default.nix
@@ -8,7 +8,8 @@
 
 let
   inherit (pkgs) bat runCommandNoCC;
-in runCommandNoCC "bat-syntaxes.bin" {} ''
+in
+runCommandNoCC "bat-syntaxes.bin" { } ''
   export HOME=$PWD
   mkdir -p .config/bat/syntaxes
   cp ${./Prolog.sublime-syntax} .config/bat/syntaxes
diff --git a/third_party/cgit/default.nix b/third_party/cgit/default.nix
index 025877ee4b72..55aaa02f32d4 100644
--- a/third_party/cgit/default.nix
+++ b/third_party/cgit/default.nix
@@ -2,7 +2,8 @@
 
 let
   inherit (pkgs) stdenv gzip bzip2 xz luajit zlib autoconf openssl pkgconfig;
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   pname = "cgit";
   version = "master";
   src = ./.;
diff --git a/third_party/clj2nix/default.nix b/third_party/clj2nix/default.nix
index 3bd21df7568f..f582debf29df 100644
--- a/third_party/clj2nix/default.nix
+++ b/third_party/clj2nix/default.nix
@@ -5,4 +5,5 @@ pkgs.callPackage "${(pkgs.fetchFromGitHub {
   repo = "clj2nix";
   rev = "3d0a38c954c8e0926f57de1d80d357df05fc2f94";
   sha256 = "0y77b988qdgsrp4w72v1f5rrh33awbps2qdgp2wr2nmmi44541w5";
-})}/clj2nix.nix" {}
+})}/clj2nix.nix"
+{ }
diff --git a/third_party/default.nix b/third_party/default.nix
index e9e3c117cec0..169727f4b9d6 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -24,32 +24,33 @@
   # be able to pass `specialArgs`. We depend on this because `depot`
   # needs to be partially evaluated in NixOS configuration before
   # module imports are resolved.
-  nixos = {
-    configuration,
-    specialArgs ? {},
-    system ? builtins.currentSystem,
-    ...
-  }:
-  let
-    eval = import "${pkgs.path}/nixos/lib/eval-config.nix" {
-      inherit specialArgs system;
-      modules = [
-        configuration
-        (import "${depot.path + "/ops/modules/default-imports.nix"}")
-      ];
-    };
+  nixos =
+    { configuration
+    , specialArgs ? { }
+    , system ? builtins.currentSystem
+    , ...
+    }:
+    let
+      eval = import "${pkgs.path}/nixos/lib/eval-config.nix" {
+        inherit specialArgs system;
+        modules = [
+          configuration
+          (import "${depot.path + "/ops/modules/default-imports.nix"}")
+        ];
+      };
 
-    # This is for `nixos-rebuild build-vm'.
-    vmConfig = (import "${pkgs.path}/nixos/lib/eval-config.nix" {
-      inherit specialArgs system;
-      modules = [
-        configuration
-        "${pkgs.path}/nixos/modules/virtualisation/qemu-vm.nix"
-      ];
-    }).config;
-  in {
-    inherit (eval) pkgs config options;
-    system = eval.config.system.build.toplevel;
-    vm = vmConfig.system.build.vm;
-  };
+      # This is for `nixos-rebuild build-vm'.
+      vmConfig = (import "${pkgs.path}/nixos/lib/eval-config.nix" {
+        inherit specialArgs system;
+        modules = [
+          configuration
+          "${pkgs.path}/nixos/modules/virtualisation/qemu-vm.nix"
+        ];
+      }).config;
+    in
+    {
+      inherit (eval) pkgs config options;
+      system = eval.config.system.build.toplevel;
+      vm = vmConfig.system.build.vm;
+    };
 }
diff --git a/third_party/dhall/default.nix b/third_party/dhall/default.nix
index 6f3782233fa3..b4de613125b7 100644
--- a/third_party/dhall/default.nix
+++ b/third_party/dhall/default.nix
@@ -5,11 +5,14 @@ let
   # broken most of the time. The binaries are also fully static
   # builds, instead of the half-static crap that nixpkgs produces.
   easy-dhall-nix =
-    import (builtins.fetchTarball {
-      url = "https://github.com/justinwoo/easy-dhall-nix/archive/eae7f64c4d6c70681e5a56c84198236930ba425e.tar.gz";
-      sha256 = "1y2x15v8a679vlpxazjpibfwajp6zph60f8wjcm4xflbvazk0dx7";
-    }) { inherit pkgs; };
-in {
+    import
+      (builtins.fetchTarball {
+        url = "https://github.com/justinwoo/easy-dhall-nix/archive/eae7f64c4d6c70681e5a56c84198236930ba425e.tar.gz";
+        sha256 = "1y2x15v8a679vlpxazjpibfwajp6zph60f8wjcm4xflbvazk0dx7";
+      })
+      { inherit pkgs; };
+in
+{
   dhall = easy-dhall-nix.dhall-simple;
   dhall-bash = easy-dhall-nix.dhall-bash-simple;
   dhall-docs = easy-dhall-nix.dhall-docs-simple;
diff --git a/third_party/elmPackages_0_18/default.nix b/third_party/elmPackages_0_18/default.nix
index 55d66f062926..e1e4f6f9c2eb 100644
--- a/third_party/elmPackages_0_18/default.nix
+++ b/third_party/elmPackages_0_18/default.nix
@@ -7,9 +7,11 @@
 
 { pkgs, ... }:
 
-(import (pkgs.fetchFromGitHub {
-  owner = "NixOS";
-  repo = "nixpkgs";
-  rev = "14f9ee66e63077539252f8b4550049381a082518";
-  sha256 = "1wn7nmb1cqfk2j91l3rwc6yhimfkzxprb8wknw5wi57yhq9m6lv1";
-}) {}).elmPackages
+(import
+  (pkgs.fetchFromGitHub {
+    owner = "NixOS";
+    repo = "nixpkgs";
+    rev = "14f9ee66e63077539252f8b4550049381a082518";
+    sha256 = "1wn7nmb1cqfk2j91l3rwc6yhimfkzxprb8wknw5wi57yhq9m6lv1";
+  })
+  { }).elmPackages
diff --git a/third_party/gerrit_plugins/builder.nix b/third_party/gerrit_plugins/builder.nix
index ff1754e088f3..0b6501801cd1 100644
--- a/third_party/gerrit_plugins/builder.nix
+++ b/third_party/gerrit_plugins/builder.nix
@@ -1,33 +1,35 @@
 { depot, pkgs, ... }:
 {
-  buildGerritBazelPlugin = {
-    name,
-    src,
-    depsOutputHash,
-    overlayPluginCmd ? ''
-      cp -R "${src}" "$out/plugins/${name}"
-    '',
-    postPatch ? "",
-  }: ((depot.third_party.gerrit.override {
-    name = "${name}.jar";
+  buildGerritBazelPlugin =
+    { name
+    , src
+    , depsOutputHash
+    , overlayPluginCmd ? ''
+        cp -R "${src}" "$out/plugins/${name}"
+      ''
+    , postPatch ? ""
+    ,
+    }: ((depot.third_party.gerrit.override {
+      name = "${name}.jar";
 
-    src = pkgs.runCommandLocal "${name}-src" {} ''
-      cp -R "${depot.third_party.gerrit.src}" "$out"
-      chmod +w "$out/plugins"
-      ${overlayPluginCmd}
-    '';
+      src = pkgs.runCommandLocal "${name}-src" { } ''
+        cp -R "${depot.third_party.gerrit.src}" "$out"
+        chmod +w "$out/plugins"
+        ${overlayPluginCmd}
+      '';
 
-    bazelTarget = "//plugins/${name}";
-  }).overrideAttrs (super: {
-    deps = super.deps.overrideAttrs (superDeps: {
-      outputHash = depsOutputHash;
-    });
-    installPhase = ''
-      cp "bazel-bin/plugins/${name}/${name}.jar" "$out"
-    '';
-    postPatch = if super ? postPatch then ''
-      ${super.postPatch}
-      ${postPatch}
-    '' else postPatch;
-  }));
+      bazelTarget = "//plugins/${name}";
+    }).overrideAttrs (super: {
+      deps = super.deps.overrideAttrs (superDeps: {
+        outputHash = depsOutputHash;
+      });
+      installPhase = ''
+        cp "bazel-bin/plugins/${name}/${name}.jar" "$out"
+      '';
+      postPatch =
+        if super ? postPatch then ''
+          ${super.postPatch}
+          ${postPatch}
+        '' else postPatch;
+    }));
 }
diff --git a/third_party/gerrit_plugins/default.nix b/third_party/gerrit_plugins/default.nix
index 8131ca2eb014..b342bf3f0e62 100644
--- a/third_party/gerrit_plugins/default.nix
+++ b/third_party/gerrit_plugins/default.nix
@@ -2,7 +2,8 @@
 
 let
   inherit (import ./builder.nix args) buildGerritBazelPlugin;
-in depot.nix.readTree.drvTargets {
+in
+depot.nix.readTree.drvTargets {
   # https://gerrit.googlesource.com/plugins/owners
   owners = buildGerritBazelPlugin rec {
     name = "owners";
diff --git a/third_party/gerrit_plugins/oauth/default.nix b/third_party/gerrit_plugins/oauth/default.nix
index 76c053ae423f..01748ba84220 100644
--- a/third_party/gerrit_plugins/oauth/default.nix
+++ b/third_party/gerrit_plugins/oauth/default.nix
@@ -2,7 +2,8 @@
 
 let
   inherit (import ../builder.nix args) buildGerritBazelPlugin;
-in buildGerritBazelPlugin rec {
+in
+buildGerritBazelPlugin rec {
   name = "oauth";
   depsOutputHash = "sha256:0j86amkw54y177s522hc988hqg034fsrkywbsb9a7h14zwcqbran";
   src = pkgs.fetchgit {
diff --git a/third_party/git/default.nix b/third_party/git/default.nix
index 75131c03c2ff..eed07b5616c6 100644
--- a/third_party/git/default.nix
+++ b/third_party/git/default.nix
@@ -2,8 +2,8 @@
 # `pkgs.srcOnly`.
 { pkgs, ... }:
 
-pkgs.git.overrideAttrs(old: {
-  patches = (old.patches or []) ++ [
+pkgs.git.overrideAttrs (old: {
+  patches = (old.patches or [ ]) ++ [
     ./0001-feat-third_party-git-date-add-dottime-format.patch
   ];
 })
diff --git a/third_party/gitignoreSource/default.nix b/third_party/gitignoreSource/default.nix
index 8bdd974e8dbe..150de7c990e4 100644
--- a/third_party/gitignoreSource/default.nix
+++ b/third_party/gitignoreSource/default.nix
@@ -1,14 +1,17 @@
 { pkgs, ... }:
 
 let
-  gitignoreNix = import (pkgs.fetchFromGitHub {
-    owner = "hercules-ci";
-    repo = "gitignore";
-    rev = "f9e996052b5af4032fe6150bba4a6fe4f7b9d698";
-    sha256 = "0jrh5ghisaqdd0vldbywags20m2cxpkbbk5jjjmwaw0gr8nhsafv";
-  }) { inherit (pkgs) lib; };
+  gitignoreNix = import
+    (pkgs.fetchFromGitHub {
+      owner = "hercules-ci";
+      repo = "gitignore";
+      rev = "f9e996052b5af4032fe6150bba4a6fe4f7b9d698";
+      sha256 = "0jrh5ghisaqdd0vldbywags20m2cxpkbbk5jjjmwaw0gr8nhsafv";
+    })
+    { inherit (pkgs) lib; };
 
-in {
+in
+{
   __functor = _: gitignoreNix.gitignoreSource;
 
   # expose extra functions here
diff --git a/third_party/gopkgs/github.com/charmbracelet/bubbletea/default.nix b/third_party/gopkgs/github.com/charmbracelet/bubbletea/default.nix
index 75eb5402c17c..8dc25bd918e0 100644
--- a/third_party/gopkgs/github.com/charmbracelet/bubbletea/default.nix
+++ b/third_party/gopkgs/github.com/charmbracelet/bubbletea/default.nix
@@ -3,15 +3,17 @@
 depot.nix.buildGo.external {
   path = "github.com/charmbracelet/bubbletea";
   src =
-    let gitSrc = pkgs.fetchFromGitHub {
+    let
+      gitSrc = pkgs.fetchFromGitHub {
         owner = "charmbracelet";
         repo = "bubbletea";
         rev = "v0.13.1";
         sha256 = "0yf2fjkvx8ym9n6f3qp2z7sxs0qsfpj148sfvbrp38k67s3h20cs";
       };
-    # The examples/ directory is fairly extensive,
-    # but it also adds most of the dependencies.
-    in pkgs.runCommand gitSrc.name {} ''
+      # The examples/ directory is fairly extensive,
+      # but it also adds most of the dependencies.
+    in
+    pkgs.runCommand gitSrc.name { } ''
       mkdir -p $out
       ln -s "${gitSrc}"/* $out
       rm -r $out/examples
diff --git a/third_party/grpc/default.nix b/third_party/grpc/default.nix
index 2ef67d402858..bef5dd9d112f 100644
--- a/third_party/grpc/default.nix
+++ b/third_party/grpc/default.nix
@@ -5,7 +5,7 @@
   stdenv = pkgs.fullLlvm11Stdenv;
   abseil-cpp = depot.third_party.abseil_cpp;
   re2 = depot.third_party.re2;
-}).overrideAttrs(orig: rec {
+}).overrideAttrs (orig: rec {
   cmakeFlags = orig.cmakeFlags ++ [
     "-DCMAKE_CXX_STANDARD_REQUIRED=ON"
     "-DCMAKE_CXX_STANDARD=17"
diff --git a/third_party/gtest/default.nix b/third_party/gtest/default.nix
index 70516853ed5c..d3540a48311a 100644
--- a/third_party/gtest/default.nix
+++ b/third_party/gtest/default.nix
@@ -2,7 +2,7 @@
 
 (pkgs.gtest.override {
   stdenv = pkgs.fullLlvm11Stdenv;
-}).overrideAttrs(_: {
+}).overrideAttrs (_: {
   src = pkgs.fetchFromGitHub {
     owner = "google";
     repo = "googletest";
diff --git a/third_party/josh/default.nix b/third_party/josh/default.nix
index 3a4e494e5f74..14e07617bea0 100644
--- a/third_party/josh/default.nix
+++ b/third_party/josh/default.nix
@@ -8,7 +8,8 @@ let
     rev = "69dc986e506ba5631c8bbf52835da076a18ec8dc";
     hash = "sha256:0ybc6ivjkm7bchaszs9lhbl1gbjnyhwq7a3vw6jml3ama84l52lb";
   };
-in depot.third_party.naersk.buildPackage {
+in
+depot.third_party.naersk.buildPackage {
   inherit src;
 
   buildInputs = with pkgs; [
@@ -18,8 +19,11 @@ in depot.third_party.naersk.buildPackage {
   ];
 
   cargoBuildOptions = x: x ++ [
-    "-p" "josh"
-    "-p" "josh-proxy"
-    "-p" "josh-ui"
+    "-p"
+    "josh"
+    "-p"
+    "josh-proxy"
+    "-p"
+    "josh-ui"
   ];
 }
diff --git a/third_party/lisp/bordeaux-threads.nix b/third_party/lisp/bordeaux-threads.nix
index 17ee6e539ef8..8a2e09950887 100644
--- a/third_party/lisp/bordeaux-threads.nix
+++ b/third_party/lisp/bordeaux-threads.nix
@@ -5,7 +5,8 @@
 let
   src = with pkgs; srcOnly lispPackages.bordeaux-threads;
   getSrc = f: "${src}/src/${f}";
-in depot.nix.buildLisp.library {
+in
+depot.nix.buildLisp.library {
   name = "bordeaux-threads";
   deps = [ depot.third_party.lisp.alexandria ];
 
diff --git a/third_party/lisp/cl-fad.nix b/third_party/lisp/cl-fad.nix
index ec1170bf1661..9350abe2e3a3 100644
--- a/third_party/lisp/cl-fad.nix
+++ b/third_party/lisp/cl-fad.nix
@@ -1,5 +1,5 @@
 # Portable pathname library
-{ depot, pkgs, ...}:
+{ depot, pkgs, ... }:
 
 with depot.nix;
 
@@ -18,7 +18,7 @@ in buildLisp.library {
   srcs = map (f: src + ("/" + f)) [
     "packages.lisp"
   ] ++ [
-    { ccl =  "${src}/openmcl.lisp"; }
+    { ccl = "${src}/openmcl.lisp"; }
   ] ++ map (f: src + ("/" + f)) [
     "fad.lisp"
     "path.lisp"
diff --git a/third_party/lisp/cl-json.nix b/third_party/lisp/cl-json.nix
index 5d1450a3e9a1..0230f274afc0 100644
--- a/third_party/lisp/cl-json.nix
+++ b/third_party/lisp/cl-json.nix
@@ -10,19 +10,20 @@ let
     rev = "6dfebb9540bfc3cc33582d0c03c9ec27cb913e79";
     sha256 = "0fx3m3x3s5ji950yzpazz4s0img3l6b3d6l3jrfjv0lr702496lh";
   };
-in buildLisp.library {
+in
+buildLisp.library {
   name = "cl-json";
   deps = [ (buildLisp.bundled "asdf") ];
 
   srcs = [ "${src}/cl-json.asd" ] ++
-  (map (f: src + ("/src/" + f)) [
-    "package.lisp"
-    "common.lisp"
-    "objects.lisp"
-    "camel-case.lisp"
-    "decoder.lisp"
-    "encoder.lisp"
-    "utils.lisp"
-    "json-rpc.lisp"
-  ]);
+    (map (f: src + ("/src/" + f)) [
+      "package.lisp"
+      "common.lisp"
+      "objects.lisp"
+      "camel-case.lisp"
+      "decoder.lisp"
+      "encoder.lisp"
+      "utils.lisp"
+      "json-rpc.lisp"
+    ]);
 }
diff --git a/third_party/lisp/cl-plus-ssl.nix b/third_party/lisp/cl-plus-ssl.nix
index bec5d5b3a205..dc0a95944fe7 100644
--- a/third_party/lisp/cl-plus-ssl.nix
+++ b/third_party/lisp/cl-plus-ssl.nix
@@ -3,12 +3,14 @@
 
 with depot.nix;
 
-let src = pkgs.fetchgit {
-  url = "https://github.com/cl-plus-ssl/cl-plus-ssl.git";
-  rev = "29081992f6d7b4e3aa2c5eeece4cd92b745071f4";
-  hash = "sha256:16lyrixl98b7vy29dbbzkbq0xaz789350dajrr1gdny5i55rkjq0";
-};
-in buildLisp.library {
+let
+  src = pkgs.fetchgit {
+    url = "https://github.com/cl-plus-ssl/cl-plus-ssl.git";
+    rev = "29081992f6d7b4e3aa2c5eeece4cd92b745071f4";
+    hash = "sha256:16lyrixl98b7vy29dbbzkbq0xaz789350dajrr1gdny5i55rkjq0";
+  };
+in
+buildLisp.library {
   name = "cl-plus-ssl";
   deps = with depot.third_party.lisp; [
     alexandria
diff --git a/third_party/lisp/cl-unicode.nix b/third_party/lisp/cl-unicode.nix
index 5fff1fbe6bb2..815d99c2dc8e 100644
--- a/third_party/lisp/cl-unicode.nix
+++ b/third_party/lisp/cl-unicode.nix
@@ -40,7 +40,7 @@ let
       "char-info.lisp"
       "read.lisp"
     ]) ++ [
-      (runCommand "dump.lisp" {} ''
+      (runCommand "dump.lisp" { } ''
         substitute ${src}/build/dump.lisp $out \
           --replace ':defaults *this-file*' ":defaults (uiop:getcwd)"
       '')
@@ -55,7 +55,7 @@ let
   };
 
 
-  generated = runCommand "cl-unicode-generated" {} ''
+  generated = runCommand "cl-unicode-generated" { } ''
     mkdir -p $out/build
     mkdir -p $out/test
     cd $out/build
@@ -66,7 +66,7 @@ let
 in
 depot.nix.buildLisp.library {
   name = "cl-unicode";
-  deps = [cl-unicode-base];
+  deps = [ cl-unicode-base ];
   srcs = [
     "${src}/conditions.lisp"
     "${generated}/lists.lisp"
diff --git a/third_party/lisp/cl-yacc.nix b/third_party/lisp/cl-yacc.nix
index d2ceb81103e2..b40d5d0601b2 100644
--- a/third_party/lisp/cl-yacc.nix
+++ b/third_party/lisp/cl-yacc.nix
@@ -1,12 +1,14 @@
 { depot, pkgs, ... }:
 
-let src = pkgs.fetchFromGitHub {
+let
+  src = pkgs.fetchFromGitHub {
     owner = "jech";
     repo = "cl-yacc";
     rev = "1334f5469251ffb3f8738a682dc8ee646cb26635";
     sha256 = "16946pzf8vvadnyfayvj8rbh4zjzw90h0azz2qk1mxrvhh5wklib";
   };
-in depot.nix.buildLisp.library {
+in
+depot.nix.buildLisp.library {
   name = "cl-yacc";
 
   srcs = map (f: src + ("/" + f)) [
diff --git a/third_party/lisp/closure-common.nix b/third_party/lisp/closure-common.nix
index 0856fc9e52d8..7f7f79f8551b 100644
--- a/third_party/lisp/closure-common.nix
+++ b/third_party/lisp/closure-common.nix
@@ -3,7 +3,8 @@
 let
   src = with pkgs; srcOnly lispPackages.closure-common;
   getSrcs = builtins.map (p: "${src}/${p}");
-in depot.nix.buildLisp.library {
+in
+depot.nix.buildLisp.library {
   name = "closure-common";
 
   # closure-common.asd surpresses some warnings otherwise breaking
@@ -18,12 +19,12 @@ in depot.nix.buildLisp.library {
     "closure-common.asd"
     "package.lisp"
     "definline.lisp"
-    "characters.lisp"     #+rune-is-character
+    "characters.lisp" #+rune-is-character
     "syntax.lisp"
-    "encodings.lisp"      #-x&y-streams-are-stream
+    "encodings.lisp" #-x&y-streams-are-stream
     "encodings-data.lisp" #-x&y-streams-are-stream
-    "xstream.lisp"        #-x&y-streams-are-stream
-    "ystream.lisp"        #-x&y-streams-are-stream
+    "xstream.lisp" #-x&y-streams-are-stream
+    "ystream.lisp" #-x&y-streams-are-stream
     "hax.lisp"
   ];
 
diff --git a/third_party/lisp/easy-routes.nix b/third_party/lisp/easy-routes.nix
index 93aed8a66765..5caf8261fa1c 100644
--- a/third_party/lisp/easy-routes.nix
+++ b/third_party/lisp/easy-routes.nix
@@ -9,7 +9,8 @@ let
     sha256 = "06lnipwc6mmg0v5gybcnr7wn5xmn5xfd1gs19vbima777245bfka";
   };
 
-in depot.nix.buildLisp.library {
+in
+depot.nix.buildLisp.library {
   name = "easy-routes";
   deps = with depot.third_party.lisp; [
     hunchentoot
diff --git a/third_party/lisp/flexi-streams.nix b/third_party/lisp/flexi-streams.nix
index 4b8880902458..a6a06d4ad057 100644
--- a/third_party/lisp/flexi-streams.nix
+++ b/third_party/lisp/flexi-streams.nix
@@ -28,6 +28,6 @@ in depot.nix.buildLisp.library {
     "input.lisp"
     "io.lisp"
     "strings.lisp"
- ];
+  ];
 }
 
diff --git a/third_party/lisp/global-vars.nix b/third_party/lisp/global-vars.nix
index 0f6630f721de..a3d27a09b6a0 100644
--- a/third_party/lisp/global-vars.nix
+++ b/third_party/lisp/global-vars.nix
@@ -3,5 +3,5 @@
 let src = with pkgs; srcOnly lispPackages.global-vars;
 in depot.nix.buildLisp.library {
   name = "global-vars";
-  srcs = [ "${src}/global-vars.lisp" ] ;
+  srcs = [ "${src}/global-vars.lisp" ];
 }
diff --git a/third_party/lisp/hunchentoot.nix b/third_party/lisp/hunchentoot.nix
index 5b953d94b29e..e2480cd349f1 100644
--- a/third_party/lisp/hunchentoot.nix
+++ b/third_party/lisp/hunchentoot.nix
@@ -1,5 +1,5 @@
 # Hunchentoot is a web framework for Common Lisp.
-{ depot, pkgs, ...}:
+{ depot, pkgs, ... }:
 
 let
   src = with pkgs; srcOnly lispPackages.hunchentoot;
@@ -15,7 +15,8 @@ let
       "url-rewrite.lisp"
     ];
   };
-in depot.nix.buildLisp.library {
+in
+depot.nix.buildLisp.library {
   name = "hunchentoot";
 
   deps = with depot.third_party.lisp; [
diff --git a/third_party/lisp/ironclad.nix b/third_party/lisp/ironclad.nix
index 3436776b7da6..324c5da265d8 100644
--- a/third_party/lisp/ironclad.nix
+++ b/third_party/lisp/ironclad.nix
@@ -1,4 +1,4 @@
-{ depot, pkgs, ...}:
+{ depot, pkgs, ... }:
 
 let
   inherit (pkgs) runCommand;
@@ -6,7 +6,8 @@ let
   src = with pkgs; srcOnly lispPackages.ironclad;
   getSrc = f: "${src}/src/${f}";
 
-in depot.nix.buildLisp.library {
+in
+depot.nix.buildLisp.library {
   name = "ironclad";
 
   deps = with depot.third_party.lisp; [
diff --git a/third_party/lisp/lass.nix b/third_party/lisp/lass.nix
index 457e25c7e532..00f66c1fe314 100644
--- a/third_party/lisp/lass.nix
+++ b/third_party/lisp/lass.nix
@@ -8,7 +8,8 @@ let
     sha256 = "11mxzyx34ynsfsrs8pgrarqi9s442vkpmh7kdpzvarhj7i97g8yx";
   };
 
-in depot.nix.buildLisp.library {
+in
+depot.nix.buildLisp.library {
   name = "lass";
 
   deps = with depot.third_party.lisp; [
diff --git a/third_party/lisp/lisp-binary.nix b/third_party/lisp/lisp-binary.nix
index 3e7a43b8ac67..8deba4546fe6 100644
--- a/third_party/lisp/lisp-binary.nix
+++ b/third_party/lisp/lisp-binary.nix
@@ -1,13 +1,15 @@
 # A library to easily read and write complex binary formats.
 { depot, pkgs, ... }:
 
-let src = pkgs.fetchFromGitHub {
-  owner = "j3pic";
-  repo = "lisp-binary";
-  rev = "052df578900dea59bf951e0a6749281fa73432e4";
-  sha256 = "1i1s5g01aimfq6lndcl1pnw7ly5hdh0wmjp2dj9cjjwbkz9lnwcf";
-};
-in depot.nix.buildLisp.library {
+let
+  src = pkgs.fetchFromGitHub {
+    owner = "j3pic";
+    repo = "lisp-binary";
+    rev = "052df578900dea59bf951e0a6749281fa73432e4";
+    sha256 = "1i1s5g01aimfq6lndcl1pnw7ly5hdh0wmjp2dj9cjjwbkz9lnwcf";
+  };
+in
+depot.nix.buildLisp.library {
   name = "lisp-binary";
 
   deps = with depot.third_party.lisp; [
diff --git a/third_party/lisp/local-time.nix b/third_party/lisp/local-time.nix
index 8e96c5e51714..1358408d387c 100644
--- a/third_party/lisp/local-time.nix
+++ b/third_party/lisp/local-time.nix
@@ -4,7 +4,8 @@
 let
   inherit (depot.nix) buildLisp;
   src = with pkgs; srcOnly lispPackages.local-time;
-in buildLisp.library {
+in
+buildLisp.library {
   name = "local-time";
   deps = [
     depot.third_party.lisp.cl-fad
diff --git a/third_party/lisp/nibbles.nix b/third_party/lisp/nibbles.nix
index 3c0a75e46dc7..b71f439c939a 100644
--- a/third_party/lisp/nibbles.nix
+++ b/third_party/lisp/nibbles.nix
@@ -3,7 +3,8 @@
 let
   inherit (depot.nix.buildLisp) bundled;
   src = with pkgs; srcOnly lispPackages.nibbles;
-in depot.nix.buildLisp.library {
+in
+depot.nix.buildLisp.library {
   name = "nibbles";
 
   deps = with depot.third_party.lisp; [
diff --git a/third_party/lisp/postmodern.nix b/third_party/lisp/postmodern.nix
index b2ea318f8a40..25e0625c20bc 100644
--- a/third_party/lisp/postmodern.nix
+++ b/third_party/lisp/postmodern.nix
@@ -88,6 +88,7 @@ let
     ];
   };
 
-in postmodern // {
+in
+postmodern // {
   inherit s-sql cl-postgres;
 }
diff --git a/third_party/lisp/routes.nix b/third_party/lisp/routes.nix
index a76912c651a9..fc7d4e306713 100644
--- a/third_party/lisp/routes.nix
+++ b/third_party/lisp/routes.nix
@@ -20,7 +20,8 @@ let
     ];
   };
 
-in depot.nix.buildLisp.library {
+in
+depot.nix.buildLisp.library {
   name = "routes";
 
   deps = with depot.third_party.lisp; [
diff --git a/third_party/lisp/s-xml/default.nix b/third_party/lisp/s-xml/default.nix
index 3cd13ffb6b67..486e1c1ac8d3 100644
--- a/third_party/lisp/s-xml/default.nix
+++ b/third_party/lisp/s-xml/default.nix
@@ -1,15 +1,17 @@
 # XML serialiser for Common Lisp.
 { depot, pkgs, ... }:
 
-let src = pkgs.applyPatches {
-  name = "s-xml-source";
-  src = pkgs.lispPackages.s-xml.src;
+let
+  src = pkgs.applyPatches {
+    name = "s-xml-source";
+    src = pkgs.lispPackages.s-xml.src;
 
-  patches = [
-    ./0001-fix-definition-order-in-xml.lisp.patch
-  ];
-};
-in depot.nix.buildLisp.library {
+    patches = [
+      ./0001-fix-definition-order-in-xml.lisp.patch
+    ];
+  };
+in
+depot.nix.buildLisp.library {
   name = "s-xml";
 
   srcs = map (f: src + ("/src/" + f)) [
diff --git a/third_party/lisp/trivial-ldap.nix b/third_party/lisp/trivial-ldap.nix
index c8a27431c687..c85fe2accbb9 100644
--- a/third_party/lisp/trivial-ldap.nix
+++ b/third_party/lisp/trivial-ldap.nix
@@ -1,12 +1,14 @@
 { depot, pkgs, ... }:
 
-let src = pkgs.fetchFromGitHub {
+let
+  src = pkgs.fetchFromGitHub {
     owner = "rwiker";
     repo = "trivial-ldap";
     rev = "3b8f1ff85f29ea63e6ab2d0d27029d68b046faf8";
     sha256 = "1zaa4wnk5y5ff211pkg6dl27j4pjwh56hq0246slxsdxv6kvp1z9";
   };
-in depot.nix.buildLisp.library {
+in
+depot.nix.buildLisp.library {
   name = "trivial-ldap";
 
   deps = with depot.third_party.lisp; [
diff --git a/third_party/lisp/trivial-mimes.nix b/third_party/lisp/trivial-mimes.nix
index 04e8b5ef5d10..b097a3d0ee67 100644
--- a/third_party/lisp/trivial-mimes.nix
+++ b/third_party/lisp/trivial-mimes.nix
@@ -3,7 +3,7 @@
 let
   src = with pkgs; srcOnly lispPackages.trivial-mimes;
 
-  mime-types = pkgs.runCommand "mime-types.lisp" {} ''
+  mime-types = pkgs.runCommand "mime-types.lisp" { } ''
     substitute ${src}/mime-types.lisp $out \
       --replace /etc/mime.types ${src}/mime.types \
       --replace "(asdf:system-source-directory :trivial-mimes)" '"/bogus-dir"'
@@ -11,7 +11,8 @@ let
       # generally fail — we are not using ASDF after all.
   '';
 
-in depot.nix.buildLisp.library {
+in
+depot.nix.buildLisp.library {
   name = "trivial-mimes";
 
   deps = [
diff --git a/third_party/lisp/uax-15.nix b/third_party/lisp/uax-15.nix
index 1e44f88d5cb7..f98c029d3688 100644
--- a/third_party/lisp/uax-15.nix
+++ b/third_party/lisp/uax-15.nix
@@ -4,7 +4,8 @@ let
   inherit (pkgs) runCommand;
   inherit (depot.nix.buildLisp) bundled;
   src = with pkgs; srcOnly lispPackages.uax-15;
-in depot.nix.buildLisp.library {
+in
+depot.nix.buildLisp.library {
   name = "uax-15";
 
   deps = with depot.third_party.lisp; [
@@ -23,7 +24,7 @@ in depot.nix.buildLisp.library {
     #
     # additionally there are some wonky variable usages of variables
     # that are never defined, for which we patch in defvar statements.
-    (runCommand "precomputed-tables.lisp" {} ''
+    (runCommand "precomputed-tables.lisp" { } ''
       substitute ${src}/src/precomputed-tables.lisp precomputed-tables.lisp \
         --replace "(asdf:system-source-directory (asdf:find-system 'uax-15 nil))" \
                   '"${src}/"'
diff --git a/third_party/lisp/unix-opts.nix b/third_party/lisp/unix-opts.nix
index e52eab959d3e..248296113263 100644
--- a/third_party/lisp/unix-opts.nix
+++ b/third_party/lisp/unix-opts.nix
@@ -1,5 +1,5 @@
 # unix-opts is a portable command line argument parser
-{ depot, pkgs, ...}:
+{ depot, pkgs, ... }:
 
 
 let src = with pkgs; srcOnly lispPackages.unix-opts;
diff --git a/third_party/lisp/usocket-server.nix b/third_party/lisp/usocket-server.nix
index f2f11d7a17c8..5d6d04535f0c 100644
--- a/third_party/lisp/usocket-server.nix
+++ b/third_party/lisp/usocket-server.nix
@@ -4,7 +4,8 @@
 let
   inherit (depot.nix) buildLisp;
   src = with pkgs; srcOnly lispPackages.usocket-server;
-in buildLisp.library {
+in
+buildLisp.library {
   name = "usocket-server";
 
   deps = with depot.third_party.lisp; [
diff --git a/third_party/lisp/usocket.nix b/third_party/lisp/usocket.nix
index 335954978494..589a3a0cfc92 100644
--- a/third_party/lisp/usocket.nix
+++ b/third_party/lisp/usocket.nix
@@ -4,7 +4,8 @@
 let
   inherit (depot.nix) buildLisp;
   src = with pkgs; srcOnly lispPackages.usocket;
-in buildLisp.library {
+in
+buildLisp.library {
   name = "usocket";
   deps = with depot.third_party.lisp; [
     (buildLisp.bundled "asdf")
diff --git a/third_party/naersk/default.nix b/third_party/naersk/default.nix
index 865fcf04d23f..855e2bd01ba2 100644
--- a/third_party/naersk/default.nix
+++ b/third_party/naersk/default.nix
@@ -1,8 +1,10 @@
 { pkgs, ... }:
 
-pkgs.callPackage (pkgs.fetchFromGitHub {
-  owner = "nmattia";
-  repo = "naersk";
-  rev = "a3f40fe42cc6d267ff7518fa3199e99ff1444ac4";
-  sha256 = "1nf7fn8anghwf6p5p58ywbcwdkjxq112qv663rn52jq9k95iakdi";
-}) {}
+pkgs.callPackage
+  (pkgs.fetchFromGitHub {
+    owner = "nmattia";
+    repo = "naersk";
+    rev = "a3f40fe42cc6d267ff7518fa3199e99ff1444ac4";
+    sha256 = "1nf7fn8anghwf6p5p58ywbcwdkjxq112qv663rn52jq9k95iakdi";
+  })
+{ }
diff --git a/third_party/nix/corepkgs/buildenv.nix b/third_party/nix/corepkgs/buildenv.nix
index 0bac4c44b48a..4da0db2ae2ae 100644
--- a/third_party/nix/corepkgs/buildenv.nix
+++ b/third_party/nix/corepkgs/buildenv.nix
@@ -9,11 +9,13 @@ derivation {
 
   # !!! grmbl, need structured data for passing this in a clean way.
   derivations =
-    map (d:
-      [ (d.meta.active or "true")
-        (d.meta.priority or 5)
-        (builtins.length d.outputs)
-      ] ++ map (output: builtins.getAttr output d) d.outputs)
+    map
+      (d:
+        [
+          (d.meta.active or "true")
+          (d.meta.priority or 5)
+          (builtins.length d.outputs)
+        ] ++ map (output: builtins.getAttr output d) d.outputs)
       derivations;
 
   # Building user environments remotely just causes huge amounts of
diff --git a/third_party/nix/corepkgs/derivation.nix b/third_party/nix/corepkgs/derivation.nix
index c0fbe8082cd3..1f95cf88ec44 100644
--- a/third_party/nix/corepkgs/derivation.nix
+++ b/third_party/nix/corepkgs/derivation.nix
@@ -8,12 +8,14 @@ let
   strict = derivationStrict drvAttrs;
 
   commonAttrs = drvAttrs // (builtins.listToAttrs outputsList) //
-    { all = map (x: x.value) outputsList;
+    {
+      all = map (x: x.value) outputsList;
       inherit drvAttrs;
     };
 
   outputToAttrListElement = outputName:
-    { name = outputName;
+    {
+      name = outputName;
       value = commonAttrs // {
         outPath = builtins.getAttr outputName strict;
         drvPath = strict.drvPath;
@@ -24,4 +26,5 @@ let
 
   outputsList = map outputToAttrListElement outputs;
 
-in (builtins.head outputsList).value
+in
+(builtins.head outputsList).value
diff --git a/third_party/nix/corepkgs/fetchurl.nix b/third_party/nix/corepkgs/fetchurl.nix
index a84777f57448..9933b7cc120c 100644
--- a/third_party/nix/corepkgs/fetchurl.nix
+++ b/third_party/nix/corepkgs/fetchurl.nix
@@ -2,12 +2,13 @@
 , url
 , hash ? "" # an SRI ash
 
-# Legacy hash specification
-, md5 ? "", sha1 ? "", sha256 ? "", sha512 ? ""
-, outputHash ?
-    if hash != "" then hash else if sha512 != "" then sha512 else if sha1 != "" then sha1 else if md5 != "" then md5 else sha256
-, outputHashAlgo ?
-    if hash != "" then "" else if sha512 != "" then "sha512" else if sha1 != "" then "sha1" else if md5 != "" then "md5" else "sha256"
+  # Legacy hash specification
+, md5 ? ""
+, sha1 ? ""
+, sha256 ? ""
+, sha512 ? ""
+, outputHash ? if hash != "" then hash else if sha512 != "" then sha512 else if sha1 != "" then sha1 else if md5 != "" then md5 else sha256
+, outputHashAlgo ? if hash != "" then "" else if sha512 != "" then "sha512" else if sha1 != "" then "sha1" else if md5 != "" then "md5" else "sha256"
 
 , executable ? false
 , unpack ? false
@@ -33,7 +34,11 @@ derivation {
     # easy proxy configuration.  This is impure, but a fixed-output
     # derivation like fetchurl is allowed to do so since its result is
     # by definition pure.
-    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
+    "http_proxy"
+    "https_proxy"
+    "ftp_proxy"
+    "all_proxy"
+    "no_proxy"
   ];
 
   # To make "nix-prefetch-url" work.
diff --git a/third_party/nix/corepkgs/imported-drv-to-derivation.nix b/third_party/nix/corepkgs/imported-drv-to-derivation.nix
index eab8b050e8ff..639f068332f2 100644
--- a/third_party/nix/corepkgs/imported-drv-to-derivation.nix
+++ b/third_party/nix/corepkgs/imported-drv-to-derivation.nix
@@ -3,19 +3,22 @@ attrs @ { drvPath, outputs, name, ... }:
 let
 
   commonAttrs = (builtins.listToAttrs outputsList) //
-    { all = map (x: x.value) outputsList;
+    {
+      all = map (x: x.value) outputsList;
       inherit drvPath name;
       type = "derivation";
     };
 
   outputToAttrListElement = outputName:
-    { name = outputName;
+    {
+      name = outputName;
       value = commonAttrs // {
         outPath = builtins.getAttr outputName attrs;
         inherit outputName;
       };
     };
-    
+
   outputsList = map outputToAttrListElement outputs;
-    
-in (builtins.head outputsList).value
+
+in
+(builtins.head outputsList).value
diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix
index e01fad12f034..bd448156f092 100644
--- a/third_party/nix/default.nix
+++ b/third_party/nix/default.nix
@@ -1,5 +1,4 @@
-args@{
-  depot ? (import ../.. {})
+args@{ depot ? (import ../.. { })
 , pkgs ? depot.third_party.nixpkgs
 , lib
 , buildType ? "release"
@@ -8,39 +7,43 @@ args@{
 
 let
   aws-s3-cpp = pkgs.aws-sdk-cpp.override {
-    apis = ["s3" "transfer"];
+    apis = [ "s3" "transfer" ];
     customMemoryManagement = false;
   };
 
-  src = let
-    srcDir = ./.;
-    # create relative paths for all the sources we are filtering
-    asRelative = path:
-      let
-        srcS = toString srcDir;
-        pathS = toString path;
-      in
+  src =
+    let
+      srcDir = ./.;
+      # create relative paths for all the sources we are filtering
+      asRelative = path:
+        let
+          srcS = toString srcDir;
+          pathS = toString path;
+        in
         if ! lib.hasPrefix srcS pathS then
           throw "Path is outside of the working directory."
         else
-        lib.removePrefix srcS pathS;
+          lib.removePrefix srcS pathS;
 
-  in builtins.filterSource (path: type:
-    # Strip out .nix files that are in the root of the repository.  Changing
-    # the expression of tvix shouldn't cause a rebuild of tvix unless really
-    # required.
-    !(dirOf (asRelative path) == "/" && lib.hasSuffix ".nix" path) &&
+    in
+    builtins.filterSource
+      (path: type:
+        # Strip out .nix files that are in the root of the repository.  Changing
+        # the expression of tvix shouldn't cause a rebuild of tvix unless really
+        # required.
+        !(dirOf (asRelative path) == "/" && lib.hasSuffix ".nix" path) &&
 
-    # remove the proto files from the repo as those are compiled separately
-    !(lib.hasPrefix "src/proto" (asRelative path)) &&
+        # remove the proto files from the repo as those are compiled separately
+        !(lib.hasPrefix "src/proto" (asRelative path)) &&
 
-    # ignore result symlinks
-    !(type == "symlink" && lib.hasPrefix "result" (baseNameOf path))
-  ) srcDir;
+        # ignore result symlinks
+        !(type == "symlink" && lib.hasPrefix "result" (baseNameOf path))
+      )
+      srcDir;
 
   # Proto generation in CMake is theoretically possible, but that is
   # very theoretical - this does it in Nix instead.
-  protoSrcs = pkgs.runCommand "nix-proto-srcs" {} ''
+  protoSrcs = pkgs.runCommand "nix-proto-srcs" { } ''
     export PROTO_SRCS=${./src/proto}
     mkdir -p $out/libproto
     ${depot.third_party.protobuf}/bin/protoc -I=$PROTO_SRCS \
@@ -52,12 +55,13 @@ let
 
   # Derivation for busybox that just has the `busybox` binary in bin/, not all
   # the symlinks, so cmake can find it
-  busybox = pkgs.runCommand "busybox" {} ''
+  busybox = pkgs.runCommand "busybox" { } ''
     mkdir -p $out/bin
     cp ${pkgs.busybox}/bin/busybox $out/bin
   '';
 
-in lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation {
+in
+lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation {
   pname = "tvix";
   version = "2.3.4";
   inherit src;
@@ -141,7 +145,7 @@ in lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation {
   # Work around broken system header include flags in the cxx toolchain.
   LIBCXX_INCLUDE = "${pkgs.llvmPackages_11.libcxx}/include/c++/v1";
 
-  SANDBOX_SHELL="${pkgs.busybox}/bin/busybox";
+  SANDBOX_SHELL = "${pkgs.busybox}/bin/busybox";
 
   # Install the various symlinks to the Nix binary which users expect
   # to exist.
@@ -190,7 +194,7 @@ in lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation {
         ${pkgs.jq}/bin/jq < compile_commands.json -r 'map(.file)|.[]' | grep -v '/generated/' | ${pkgs.parallel}/bin/parallel ${pkgs.clang-tools}/bin/clang-tidy -p compile_commands.json $@
       '';
 
-      installCheckInputs = up.installCheckInputs ++ [run_clang_tidy];
+      installCheckInputs = up.installCheckInputs ++ [ run_clang_tidy ];
 
       shellHook = ''
         export NIX_DATA_DIR="${toString depot.path}/third_party"
diff --git a/third_party/nix/test-vm.nix b/third_party/nix/test-vm.nix
index e5f8690fcb2d..8b00e5515ba2 100644
--- a/third_party/nix/test-vm.nix
+++ b/third_party/nix/test-vm.nix
@@ -16,4 +16,5 @@ let
   };
 
   system = depot.third_party.nixos { inherit configuration; };
-in system.vm
+in
+system.vm
diff --git a/third_party/nixery/default.nix b/third_party/nixery/default.nix
index be3a9dfc1b7d..7a798ca0b074 100644
--- a/third_party/nixery/default.nix
+++ b/third_party/nixery/default.nix
@@ -12,7 +12,8 @@ let
     rev = commit;
     sha256 = "195rz25y3hfxcmniysajzjg7g69qhz7w06lql8fn0dbcdcxsq6g4";
   };
-in drvTargets (import src {
+in
+drvTargets (import src {
   inherit pkgs;
   commitHash = _: commit;
 })
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 5afed93e4c60..c5fa6a6781b0 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -6,7 +6,7 @@
 # in //default.nix passes this attribute as the `pkgs` argument to all
 # readTree derivations.
 
-{ depot ? {}, externalArgs ? {}, depotOverlays ? true, ... }:
+{ depot ? { }, externalArgs ? { }, depotOverlays ? true, ... }:
 
 let
   # This provides the sources of nixpkgs. We track both
@@ -42,7 +42,7 @@ let
 
   # Stable package set is imported, but not exposed, to overlay
   # required packages into the unstable set.
-  stableNixpkgs = import stableNixpkgsSrc {};
+  stableNixpkgs = import stableNixpkgsSrc { };
 
   # Overlay for packages that should come from the stable channel
   # instead (e.g. because something is broken in unstable).
@@ -58,7 +58,8 @@ let
     };
   };
 
-in import nixpkgsSrc {
+in
+import nixpkgsSrc {
   # allow users to inject their config into builds (e.g. to test CA derivations)
   config =
     (if externalArgs ? nixpkgsConfig then externalArgs.nixpkgsConfig else { })
@@ -75,5 +76,5 @@ in import nixpkgsSrc {
     depot.third_party.overlays.emacs
     depot.third_party.overlays.tvl
     depot.third_party.overlays.ecl-static
-  ] else []);
+  ] else [ ]);
 }
diff --git a/third_party/overlays/emacs.nix b/third_party/overlays/emacs.nix
index 895c45a9bcee..1dba4a739303 100644
--- a/third_party/overlays/emacs.nix
+++ b/third_party/overlays/emacs.nix
@@ -8,4 +8,5 @@ let
     url = "https://github.com/nix-community/emacs-overlay/archive/${commit}.tar.gz";
     sha256 = "1b7rmshf1wc9wcml7jlzggdzilj644brk5m49fry6lv53vqmykjq";
   };
-in import src
+in
+import src
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix
index 6e1ec2d0d1e5..8ea57f209662 100644
--- a/third_party/overlays/haskell/default.nix
+++ b/third_party/overlays/haskell/default.nix
@@ -11,7 +11,8 @@ let
     generic-arbitrary = appendPatch hsSuper.generic-arbitrary
       [ ./patches/generic-arbitrary-export-garbitrary.patch ];
   };
-in {
+in
+{
   haskellPackages = super.haskellPackages.override {
     inherit overrides;
   };
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index e6e97b834785..1b2f2b9792f6 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -28,14 +28,14 @@ self: super: {
       notmuch = super.notmuch.emacs;
 
       # Build EXWM with the depot sources instead.
-      exwm = esuper.exwm.overrideAttrs(_: {
+      exwm = esuper.exwm.overrideAttrs (_: {
         src = depot.path.origSrc + "/third_party/exwm";
       });
     })
   );
 
   # dottime support for notmuch
-  notmuch = super.notmuch.overrideAttrs(old: {
+  notmuch = super.notmuch.overrideAttrs (old: {
     passthru = old.passthru // {
       patches = old.patches ++ [ ./patches/notmuch-dottime.patch ];
     };
@@ -46,13 +46,13 @@ self: super: {
   nix-serve = super.nix-serve.override { nix = super.nix_2_3; };
 
   # Avoid builds of mkShell derivations in CI.
-  mkShell = super.lib.makeOverridable(args: (super.mkShell args) // {
+  mkShell = super.lib.makeOverridable (args: (super.mkShell args) // {
     meta.ci.skip = true;
   });
 
   # bump nixpkgs-fmt to a version that doesn't touch whitespace in
   # strings
-  nixpkgs-fmt = super.nixpkgs-fmt.overrideAttrs(old: rec {
+  nixpkgs-fmt = super.nixpkgs-fmt.overrideAttrs (old: rec {
     src = self.fetchFromGitHub {
       owner = "nix-community";
       repo = "nixpkgs-fmt";
@@ -60,7 +60,7 @@ self: super: {
       sha256 = "0hjkbcgz62793hzfzlaxyah8a2c1k79n1k891lg7kfw8mkbq0w4p";
     };
 
-    cargoDeps = old.cargoDeps.overrideAttrs(_: {
+    cargoDeps = old.cargoDeps.overrideAttrs (_: {
       inherit src;
       outputHash = "10if2lmv8d95j3walq3ggx3y423yfy4yl9vplw3apd0s671bly8b";
     });
diff --git a/third_party/prometheus-fail2ban-exporter/default.nix b/third_party/prometheus-fail2ban-exporter/default.nix
index bed5bd630161..818839e48c72 100644
--- a/third_party/prometheus-fail2ban-exporter/default.nix
+++ b/third_party/prometheus-fail2ban-exporter/default.nix
@@ -10,7 +10,8 @@ let
     p.prometheus_client
   ]);
 
-in pkgs.writeShellScriptBin "prometheus-fail2ban-exporter" ''
+in
+pkgs.writeShellScriptBin "prometheus-fail2ban-exporter" ''
   set -eo pipefail
 
   exec "${python}/bin/python" "${script}"
diff --git a/third_party/python/broadlink/default.nix b/third_party/python/broadlink/default.nix
index e316d83d1d71..b1dcf300811d 100644
--- a/third_party/python/broadlink/default.nix
+++ b/third_party/python/broadlink/default.nix
@@ -7,7 +7,8 @@
 let
   inherit (pkgs) fetchFromGitHub;
   inherit (pkgs.python3Packages) buildPythonPackage cryptography;
-in buildPythonPackage (lib.fix (self: {
+in
+buildPythonPackage (lib.fix (self: {
   pname = "python-broadlink";
   version = "0.13.2";
   src = ./.;
diff --git a/third_party/rust-crates/default.nix b/third_party/rust-crates/default.nix
index b912a9bde3d4..b3246dd0a363 100644
--- a/third_party/rust-crates/default.nix
+++ b/third_party/rust-crates/default.nix
@@ -4,17 +4,17 @@
 # Intended for manual updates, which keeps us honest with what we pull into our closure.
 
 let
-  buildRustCrate = attrs@{
-    edition ? "2018",
-    pname,
-    crateName ? pname,
-    ...
-  }: pkgs.buildRustCrate (attrs // {
-    inherit
-      crateName
-      edition
-      ;
-   });
+  buildRustCrate =
+    attrs@{ edition ? "2018"
+    , pname
+    , crateName ? pname
+    , ...
+    }: pkgs.buildRustCrate (attrs // {
+      inherit
+        crateName
+        edition
+        ;
+    });
 in
 
 rec {
diff --git a/third_party/rustsec-advisory-db/default.nix b/third_party/rustsec-advisory-db/default.nix
index 3d3b387be84f..b30e98fa4aa8 100644
--- a/third_party/rustsec-advisory-db/default.nix
+++ b/third_party/rustsec-advisory-db/default.nix
@@ -20,5 +20,5 @@ pkgs.fetchFromGitHub {
   inherit (pin)
     rev
     sha256
-  ;
+    ;
 }
-- 
cgit 1.4.1