Merge remote-tracking branch 'origin/master' into staging-next

nixos/lib/eval-config.nix

@@ -104,7 +104,7 @@ let
     in
     locatedModules ++ legacyModules;
 
-  noUserModules = evalModulesMinimal ({
+  noUserModules = evalModulesMinimal {
     inherit prefix specialArgs;
     modules =
       baseModules
@@ -113,7 +113,7 @@ let
         pkgsModule
         modulesModule
       ];
-  });
+  };
 
   # Extra arguments that are useful for constructing a similar configuration.
   modulesModule = {

nixos/lib/systemd-lib.nix

@@ -370,12 +370,13 @@ rec {
     }:
     let
       typeDir =
-        ({
+        {
           system = "system";
           initrd = "system";
           user = "user";
           nspawn = "nspawn";
-        }).${type};
+        }
+        .${type};
     in
     pkgs.runCommand "${type}-units"
       {

nixos/lib/testing/network.nix

@@ -104,9 +104,9 @@ let
           optionalString (
             config.networking.primaryIPAddress != ""
           ) "${config.networking.primaryIPAddress} ${hostnames}"
-          + optionalString (config.networking.primaryIPv6Address != "") (
-            "${config.networking.primaryIPv6Address} ${hostnames}"
-          )
+          + optionalString (
+            config.networking.primaryIPv6Address != ""
+          ) "${config.networking.primaryIPv6Address} ${hostnames}"
         );
 
         virtualisation.qemu.options = qemuOptions;