TEST: reformat all nix files with nixpkgs-fmt

doc/default.nix

@@ -1,8 +1,9 @@
-{ pkgs ? (import ./.. { }), nixpkgs ? { }}:
+{ pkgs ? (import ./.. { }), nixpkgs ? { } }:
 let
   lib = pkgs.lib;
   doc-support = import ./doc-support { inherit pkgs nixpkgs; };
-in pkgs.stdenv.mkDerivation {
+in
+pkgs.stdenv.mkDerivation {
   name = "nixpkgs-manual";
 
   nativeBuildInputs = with pkgs; [

doc/doc-support/default.nix

@@ -1,4 +1,4 @@
-{ pkgs ? (import ../.. {}), nixpkgs ? { }}:
+{ pkgs ? (import ../.. { }), nixpkgs ? { } }:
 let
   locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs; };
   functionDocs = import ./lib-function-docs.nix { inherit locationsXml pkgs; };
@@ -23,23 +23,24 @@ let
       <xsl:import href="${./parameters.xml}"/>
     </xsl:stylesheet>
   '';
-in pkgs.runCommand "doc-support" {}
-''
-  mkdir result
-  (
-    cd result
-    ln -s ${locationsXml} ./function-locations.xml
-    ln -s ${functionDocs} ./function-docs
+in
+pkgs.runCommand "doc-support" { }
+  ''
+    mkdir result
+    (
+      cd result
+      ln -s ${locationsXml} ./function-locations.xml
+      ln -s ${functionDocs} ./function-docs
 
-    ln -s ${pkgs.docbook5}/xml/rng/docbook/docbook.rng ./docbook.rng
-    ln -s ${pkgs.docbook_xsl_ns}/xml/xsl ./xsl
-    ln -s ${epub-xsl} ./epub.xsl
-    ln -s ${xhtml-xsl} ./xhtml.xsl
+      ln -s ${pkgs.docbook5}/xml/rng/docbook/docbook.rng ./docbook.rng
+      ln -s ${pkgs.docbook_xsl_ns}/xml/xsl ./xsl
+      ln -s ${epub-xsl} ./epub.xsl
+      ln -s ${xhtml-xsl} ./xhtml.xsl
 
-    ln -s ${../../nixos/doc/xmlformat.conf} ./xmlformat.conf
-    ln -s ${pkgs.documentation-highlighter} ./highlightjs
+      ln -s ${../../nixos/doc/xmlformat.conf} ./xmlformat.conf
+      ln -s ${pkgs.documentation-highlighter} ./highlightjs
 
-    echo -n "${version}" > ./version
-  )
-  mv result $out
-''
+      echo -n "${version}" > ./version
+    )
+    mv result $out
+  ''

doc/doc-support/lib-function-docs.nix

@@ -2,7 +2,7 @@
 # another library function file to this list, the include list in the
 # file `doc/functions/library.xml` must also be updated.
 
-{ pkgs ? import ./.. {}, locationsXml }:
+{ pkgs ? import ./.. { }, locationsXml }:
 
 with pkgs; stdenv.mkDerivation {
   name = "nixpkgs-lib-docs";

doc/doc-support/lib-function-locations.nix

@@ -1,4 +1,4 @@
-{ pkgs ? (import ./.. { }), nixpkgs ? { }}:
+{ pkgs ? (import ./.. { }), nixpkgs ? { } }:
 let
   revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master");
 
@@ -23,20 +23,21 @@ let
   nixpkgsLib = pkgs.lib;
 
   flattenedLibSubset = { subsetname, functions }:
-  builtins.map
-    (fn: {
-      name = "lib.${subsetname}.${fn.name}";
-      value = fn.location;
-    })
-    functions;
+    builtins.map
+      (fn: {
+        name = "lib.${subsetname}.${fn.name}";
+        value = fn.location;
+      })
+      functions;
 
   locatedlibsets = libs: builtins.map flattenedLibSubset (libset libs);
   removeFilenamePrefix = prefix: filename:
     let
-    prefixLen = (builtins.stringLength prefix) + 1; # +1 to remove the leading /
+      prefixLen = (builtins.stringLength prefix) + 1; # +1 to remove the leading /
       filenameLen = builtins.stringLength filename;
       substr = builtins.substring prefixLen filenameLen filename;
-      in substr;
+    in
+    substr;
 
   removeNixpkgs = removeFilenamePrefix (builtins.toString pkgs.path);
 
@@ -54,32 +55,33 @@ let
 
   relativeLocs = (builtins.map fnLocationRelative liblocations);
   sanitizeId = builtins.replaceStrings
-    [ "'"      ]
+    [ "'" ]
     [ "-prime" ];
 
   urlPrefix = "https://github.com/NixOS/nixpkgs/blob/${revision}";
   xmlstrings = (nixpkgsLib.strings.concatMapStrings
-      ({ name, value }:
+    ({ name, value }:
       ''
-      <section><title>${name}</title>
-        <para xml:id="${sanitizeId name}">
-        Located at
-        <link
-          xlink:href="${urlPrefix}/${value.file}#L${builtins.toString value.line}">${value.file}:${builtins.toString value.line}</link>
-        in  <literal>&lt;nixpkgs&gt;</literal>.
-        </para>
-        </section>
+        <section><title>${name}</title>
+          <para xml:id="${sanitizeId name}">
+          Located at
+          <link
+            xlink:href="${urlPrefix}/${value.file}#L${builtins.toString value.line}">${value.file}:${builtins.toString value.line}</link>
+          in  <literal>&lt;nixpkgs&gt;</literal>.
+          </para>
+          </section>
       '')
-      relativeLocs);
+    relativeLocs);
 
-in pkgs.writeText
-    "locations.xml"
-    ''
+in
+pkgs.writeText
+  "locations.xml"
+  ''
     <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          version="5">
          <title>All the locations for every lib function</title>
          <para>This file is only for inclusion by other files.</para>
          ${xmlstrings}
     </section>
-    ''
+  ''

doc/shell.nix

@@ -1,3 +1,3 @@
 { pkgs ? import ../. { } }:
 (import ./default.nix { }).overrideAttrs
-(x: { buildInputs = (x.buildInputs or [ ]) ++ [ pkgs.xmloscopy pkgs.ruby ]; })
+  (x: { buildInputs = (x.buildInputs or [ ]) ++ [ pkgs.xmloscopy pkgs.ruby ]; })

flake.nix

@@ -42,7 +42,7 @@
                       ({ config, ... }: {
                         virtualisation.useEFIBoot =
                           config.boot.loader.systemd-boot.enable ||
-                          config.boot.loader.efi.canTouchEfiVariables;
+                            config.boot.loader.efi.canTouchEfiVariables;
                       })
                     ];
                   })).config;