treewide: run nixfmt 1.0.0

Author: wolfgangwalther

doc/hooks/tauri.section.md

@@ -45,7 +45,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     # Make sure we can find our libraries
     pkg-config
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     glib-networking # Most Tauri apps need networking

doc/languages-frameworks/coq.section.md

@@ -177,10 +177,8 @@ For instance, here is how you could add some code to be performed in the derivat
 
 ```nix
 coqPackages.multinomials.overrideAttrs (oldAttrs: {
-  postInstall =
-    oldAttrs.postInstall or ""
-    + ''
-      echo "you can do anything you want here"
-    '';
+  postInstall = oldAttrs.postInstall or "" + ''
+    echo "you can do anything you want here"
+  '';
 })
 ```

doc/languages-frameworks/python.section.md

@@ -1376,20 +1376,19 @@ This is especially helpful to select tests or specify flags conditionally:
 
 ```nix
 {
-  disabledTests =
-    [
-      # touches network
-      "download"
-      "update"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.8") [
-      # broken due to python3.8 async changes
-      "async"
-    ]
-    ++ lib.optionals stdenv.buildPlatform.isDarwin [
-      # can fail when building with other packages
-      "socket"
-    ];
+  disabledTests = [
+    # touches network
+    "download"
+    "update"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.8") [
+    # broken due to python3.8 async changes
+    "async"
+  ]
+  ++ lib.optionals stdenv.buildPlatform.isDarwin [
+    # can fail when building with other packages
+    "socket"
+  ];
 }
 ```
 
@@ -2035,7 +2034,8 @@ and letting the package requiring the extra add the list to its dependencies
 {
   dependencies = [
     # ...
-  ] ++ dask.optional-dependencies.complete;
+  ]
+  ++ dask.optional-dependencies.complete;
 }
 ```
 

doc/stdenv/cross-compilation.chapter.md

@@ -171,7 +171,8 @@ e.g.
 {
   nativeBuildInputs = [
     meson
-  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ];
 }
 ```
 

lib/customisation.nix

@@ -446,16 +446,15 @@ rec {
     let
       outputs = drv.outputs or [ "out" ];
 
-      commonAttrs =
-        {
-          inherit (drv) name system meta;
-          inherit outputs;
-        }
-        // optionalAttrs (drv._hydraAggregate or false) {
-          _hydraAggregate = true;
-          constituents = map hydraJob (flatten drv.constituents);
-        }
-        // (listToAttrs outputsList);
+      commonAttrs = {
+        inherit (drv) name system meta;
+        inherit outputs;
+      }
+      // optionalAttrs (drv._hydraAggregate or false) {
+        _hydraAggregate = true;
+        constituents = map hydraJob (flatten drv.constituents);
+      }
+      // (listToAttrs outputsList);
 
       makeOutput =
         outputName:

lib/deprecated/misc.nix

@@ -355,8 +355,11 @@ let
   mergeAttrByFunc =
     x: y:
     let
-      mergeAttrBy2 =
-        { mergeAttrBy = mergeAttrs; } // (maybeAttr "mergeAttrBy" { } x) // (maybeAttr "mergeAttrBy" { } y);
+      mergeAttrBy2 = {
+        mergeAttrBy = mergeAttrs;
+      }
+      // (maybeAttr "mergeAttrBy" { } x)
+      // (maybeAttr "mergeAttrBy" { } y);
     in
     foldr mergeAttrs { } [
       x

lib/modules.nix

@@ -886,19 +886,18 @@ let
       path = showOption loc;
       depth = length loc;
 
-      paragraphs =
-        [
-          "In module ${file}: expected an option declaration at option path `${path}` but got an attribute set with type ${actualTag}"
-        ]
-        ++ optional (actualTag == "option-type") ''
-          When declaring an option, you must wrap the type in a `mkOption` call. It should look somewhat like:
-              ${comment}
-              ${name} = lib.mkOption {
-                description = ...;
-                type = <the type you wrote for ${name}>;
-                ...
-              };
-        '';
+      paragraphs = [
+        "In module ${file}: expected an option declaration at option path `${path}` but got an attribute set with type ${actualTag}"
+      ]
+      ++ optional (actualTag == "option-type") ''
+        When declaring an option, you must wrap the type in a `mkOption` call. It should look somewhat like:
+            ${comment}
+            ${name} = lib.mkOption {
+              description = ...;
+              type = <the type you wrote for ${name}>;
+              ...
+            };
+      '';
 
       # Ideally we'd know the exact syntax they used, but short of that,
       # we can only reliably repeat the last. However, we repeat the
@@ -1627,25 +1626,24 @@ let
         ) from
       );
 
-      config =
-        {
-          warnings = filter (x: x != "") (
-            map (
-              f:
-              let
-                val = getAttrFromPath f config;
-                opt = getAttrFromPath f options;
-              in
-              optionalString (val != "_mkMergedOptionModule")
-                "The option `${showOption f}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly."
-            ) from
-          );
-        }
-        // setAttrByPath to (
-          mkMerge (
-            optional (any (f: (getAttrFromPath f config) != "_mkMergedOptionModule") from) (mergeFn config)
-          )
+      config = {
+        warnings = filter (x: x != "") (
+          map (
+            f:
+            let
+              val = getAttrFromPath f config;
+              opt = getAttrFromPath f options;
+            in
+            optionalString (val != "_mkMergedOptionModule")
+              "The option `${showOption f}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly."
+          ) from
         );
+      }
+      // setAttrByPath to (
+        mkMerge (
+          optional (any (f: (getAttrFromPath f config) != "_mkMergedOptionModule") from) (mergeFn config)
+        )
+      );
     };
 
   /**

lib/options.nix

@@ -572,30 +572,29 @@ rec {
       opt:
       let
         name = showOption opt.loc;
-        docOption =
-          {
-            loc = opt.loc;
-            inherit name;
-            description = opt.description or null;
-            declarations = filter (x: x != unknownModule) opt.declarations;
-            internal = opt.internal or false;
-            visible = if (opt ? visible && opt.visible == "shallow") then true else opt.visible or true;
-            readOnly = opt.readOnly or false;
-            type = opt.type.description or "unspecified";
-          }
-          // optionalAttrs (opt ? example) {
-            example = builtins.addErrorContext "while evaluating the example of option `${name}`" (
-              renderOptionValue opt.example
-            );
-          }
-          // optionalAttrs (opt ? defaultText || opt ? default) {
-            default = builtins.addErrorContext "while evaluating the ${
-              if opt ? defaultText then "defaultText" else "default value"
-            } of option `${name}`" (renderOptionValue (opt.defaultText or opt.default));
-          }
-          // optionalAttrs (opt ? relatedPackages && opt.relatedPackages != null) {
-            inherit (opt) relatedPackages;
-          };
+        docOption = {
+          loc = opt.loc;
+          inherit name;
+          description = opt.description or null;
+          declarations = filter (x: x != unknownModule) opt.declarations;
+          internal = opt.internal or false;
+          visible = if (opt ? visible && opt.visible == "shallow") then true else opt.visible or true;
+          readOnly = opt.readOnly or false;
+          type = opt.type.description or "unspecified";
+        }
+        // optionalAttrs (opt ? example) {
+          example = builtins.addErrorContext "while evaluating the example of option `${name}`" (
+            renderOptionValue opt.example
+          );
+        }
+        // optionalAttrs (opt ? defaultText || opt ? default) {
+          default = builtins.addErrorContext "while evaluating the ${
+            if opt ? defaultText then "defaultText" else "default value"
+          } of option `${name}`" (renderOptionValue (opt.defaultText or opt.default));
+        }
+        // optionalAttrs (opt ? relatedPackages && opt.relatedPackages != null) {
+          inherit (opt) relatedPackages;
+        };
 
         subOptions =
           let

lib/path/tests/default.nix

@@ -14,14 +14,13 @@
 
 pkgs.runCommand "lib-path-tests"
   {
-    nativeBuildInputs =
-      [
-        nixVersions.stable
-      ]
-      ++ (with pkgs; [
-        jq
-        bc
-      ]);
+    nativeBuildInputs = [
+      nixVersions.stable
+    ]
+    ++ (with pkgs; [
+      jq
+      bc
+    ]);
   }
   ''
     # Needed to make Nix evaluation work

lib/systems/architectures.nix

@@ -477,7 +477,8 @@ rec {
       "armv9.1-a" = [
         "armv9-a"
         "armv8.6-a"
-      ] ++ inferiors."armv8.6-a";
+      ]
+      ++ inferiors."armv8.6-a";
       "armv9.2-a" = lib.unique (
         [
           "armv9.1-a"
@@ -503,12 +504,14 @@ rec {
         "armv8.2-a"
         "cortex-a53"
         "cortex-a72"
-      ] ++ inferiors."armv8.2-a";
+      ]
+      ++ inferiors."armv8.2-a";
       cortex-a76 = [
         "armv8.2-a"
         "cortex-a53"
         "cortex-a72"
-      ] ++ inferiors."armv8.2-a";
+      ]
+      ++ inferiors."armv8.2-a";
 
       # Ampere
       ampere1 = withInferiors [