treewide: Format all Nix files

Format all Nix files using the officially approved formatter, making the CI check introduced in the previous commit succeed: nix-build ci -A fmt.check This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153) of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166). This commit will lead to merge conflicts for a number of PRs, up to an estimated ~1100 (~33%) among the PRs with activity in the past 2 months, but that should be lower than what it would be without the previous [partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537). Merge conflicts caused by this commit can now automatically be resolved while rebasing using the [auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase). If you run into any problems regarding any of this, please reach out to the [formatting team](https://nixos.org/community/teams/formatting/) by pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
parent 2140bf39e4
commit 374e6bcc40
1523 changed files with 986047 additions and 513621 deletions
--- a/nixos/modules/image/repart-image.nix
+++ b/nixos/modules/image/repart-image.nix
@@ -1,82 +1,108 @@
 # This is an expression meant to be called from `./repart.nix`, it is NOT a
 # NixOS module that can be imported.

-{ lib
-, stdenvNoCC
-, runCommand
-, python3
-, black
-, ruff
-, mypy
-, systemd
-, fakeroot
-, util-linux
+{
+  lib,
+  stdenvNoCC,
+  runCommand,
+  python3,
+  black,
+  ruff,
+  mypy,
+  systemd,
+  fakeroot,
+  util-linux,

  # filesystem tools
-, dosfstools
-, mtools
-, e2fsprogs
-, squashfsTools
-, erofs-utils
-, btrfs-progs
-, xfsprogs
+  dosfstools,
+  mtools,
+  e2fsprogs,
+  squashfsTools,
+  erofs-utils,
+  btrfs-progs,
+  xfsprogs,

  # compression tools
-, zstd
-, xz
-, zeekstd
+  zstd,
+  xz,
+  zeekstd,

  # arguments
-, name
-, version
-, imageFileBasename
-, compression
-, fileSystems
-, finalPartitions
-, split
-, seed
-, definitionsDirectory
-, sectorSize
-, mkfsEnv ? {}
-, createEmpty ? true
+  name,
+  version,
+  imageFileBasename,
+  compression,
+  fileSystems,
+  finalPartitions,
+  split,
+  seed,
+  definitionsDirectory,
+  sectorSize,
+  mkfsEnv ? { },
+  createEmpty ? true,
 }:

 let
-  systemdArch = let
-    inherit (stdenvNoCC) hostPlatform;
-  in
-    if hostPlatform.isAarch32 then "arm"
-    else if hostPlatform.isAarch64 then "arm64"
-    else if hostPlatform.isx86_32 then "x86"
-    else if hostPlatform.isx86_64 then "x86-64"
-    else if hostPlatform.isMips32 then "mips-le"
-    else if hostPlatform.isMips64 then "mips64-le"
-    else if hostPlatform.isPower then "ppc"
-    else if hostPlatform.isPower64 then "ppc64"
-    else if hostPlatform.isRiscV32 then "riscv32"
-    else if hostPlatform.isRiscV64 then "riscv64"
-    else if hostPlatform.isS390 then "s390"
-    else if hostPlatform.isS390x then "s390x"
-    else if hostPlatform.isLoongArch64 then "loongarch64"
-    else if hostPlatform.isAlpha then "alpha"
-    else hostPlatform.parsed.cpu.name;
+  systemdArch =
+    let
+      inherit (stdenvNoCC) hostPlatform;
+    in
+    if hostPlatform.isAarch32 then
+      "arm"
+    else if hostPlatform.isAarch64 then
+      "arm64"
+    else if hostPlatform.isx86_32 then
+      "x86"
+    else if hostPlatform.isx86_64 then
+      "x86-64"
+    else if hostPlatform.isMips32 then
+      "mips-le"
+    else if hostPlatform.isMips64 then
+      "mips64-le"
+    else if hostPlatform.isPower then
+      "ppc"
+    else if hostPlatform.isPower64 then
+      "ppc64"
+    else if hostPlatform.isRiscV32 then
+      "riscv32"
+    else if hostPlatform.isRiscV64 then
+      "riscv64"
+    else if hostPlatform.isS390 then
+      "s390"
+    else if hostPlatform.isS390x then
+      "s390x"
+    else if hostPlatform.isLoongArch64 then
+      "loongarch64"
+    else if hostPlatform.isAlpha then
+      "alpha"
+    else
+      hostPlatform.parsed.cpu.name;

-  amendRepartDefinitions = runCommand "amend-repart-definitions.py"
-    {
-      # TODO: ruff does not splice properly in nativeBuildInputs
-      depsBuildBuild = [ ruff ];
-      nativeBuildInputs = [ python3 black mypy ];
-    } ''
-    install ${./amend-repart-definitions.py} $out
-    patchShebangs --build $out
+  amendRepartDefinitions =
+    runCommand "amend-repart-definitions.py"
+      {
+        # TODO: ruff does not splice properly in nativeBuildInputs
+        depsBuildBuild = [ ruff ];
+        nativeBuildInputs = [
+          python3
+          black
+          mypy
+        ];
+      }
+      ''
+        install ${./amend-repart-definitions.py} $out
+        patchShebangs --build $out

-    black --check --diff $out
-    ruff check --line-length 88 $out
-    mypy --strict $out
-  '';
+        black --check --diff $out
+        ruff check --line-length 88 $out
+        mypy --strict $out
+      '';

  fileSystemToolMapping = {
-    "vfat" = [ dosfstools mtools ];
+    "vfat" = [
+      dosfstools
+      mtools
+    ];
    "ext4" = [ e2fsprogs.bin ];
    "squashfs" = [ squashfsTools ];
    "erofs" = [ erofs-utils ];
@@ -87,108 +113,127 @@ let

  fileSystemTools = builtins.concatMap (f: fileSystemToolMapping."${f}") fileSystems;

-  compressionPkg = {
-    "zstd" = zstd;
-    "xz" = xz;
-    "zstd-seekable" = zeekstd;
-  }."${compression.algorithm}";
+  compressionPkg =
+    {
+      "zstd" = zstd;
+      "xz" = xz;
+      "zstd-seekable" = zeekstd;
+    }
+    ."${compression.algorithm}";

-  compressionCommand = {
-    "zstd" = "zstd --no-progress --threads=$NIX_BUILD_CORES -${toString compression.level}";
-    "xz" = "xz --keep --verbose --threads=$NIX_BUILD_CORES -${toString compression.level}";
-    "zstd-seekable" = "zeekstd --quiet --max-frame-size 2M --compression-level ${toString compression.level}";
-  }."${compression.algorithm}";
+  compressionCommand =
+    {
+      "zstd" = "zstd --no-progress --threads=$NIX_BUILD_CORES -${toString compression.level}";
+      "xz" = "xz --keep --verbose --threads=$NIX_BUILD_CORES -${toString compression.level}";
+      "zstd-seekable" =
+        "zeekstd --quiet --max-frame-size 2M --compression-level ${toString compression.level}";
+    }
+    ."${compression.algorithm}";
 in
-  stdenvNoCC.mkDerivation (finalAttrs:
-  (if (version != null)
-  then { pname = name; inherit version; }
-  else { inherit name;  }
-  ) // {
-  __structuredAttrs = true;
+stdenvNoCC.mkDerivation (
+  finalAttrs:
+  (
+    if (version != null) then
+      {
+        pname = name;
+        inherit version;
+      }
+    else
+      { inherit name; }
+  )
+  // {
+    __structuredAttrs = true;

+    # the image will be self-contained so we can drop references
+    # to the closure that was used to build it
+    unsafeDiscardReferences.out = true;

-  # the image will be self-contained so we can drop references
-  # to the closure that was used to build it
-  unsafeDiscardReferences.out = true;
+    nativeBuildInputs =
+      [
+        systemd
+        util-linux
+        fakeroot
+      ]
+      ++ lib.optionals (compression.enable) [
+        compressionPkg
+      ]
+      ++ fileSystemTools;

-  nativeBuildInputs = [
-    systemd
-    util-linux
-    fakeroot
-  ] ++ lib.optionals (compression.enable) [
-    compressionPkg
-  ] ++ fileSystemTools;
+    env = mkfsEnv;

-  env = mkfsEnv;
+    inherit finalPartitions definitionsDirectory;

-  inherit finalPartitions definitionsDirectory;
+    partitionsJSON = builtins.toJSON finalAttrs.finalPartitions;

-  partitionsJSON = builtins.toJSON finalAttrs.finalPartitions;
+    # relative path to the repart definitions that are read by systemd-repart
+    finalRepartDefinitions = "repart.d";

-  # relative path to the repart definitions that are read by systemd-repart
-  finalRepartDefinitions = "repart.d";
+    systemdRepartFlags =
+      [
+        "--architecture=${systemdArch}"
+        "--dry-run=no"
+        "--size=auto"
+        "--seed=${seed}"
+        "--definitions=${finalAttrs.finalRepartDefinitions}"
+        "--split=${lib.boolToString split}"
+        "--json=pretty"
+      ]
+      ++ lib.optionals createEmpty [
+        "--empty=create"
+      ]
+      ++ lib.optionals (sectorSize != null) [
+        "--sector-size=${toString sectorSize}"
+      ];

-  systemdRepartFlags = [
-    "--architecture=${systemdArch}"
-    "--dry-run=no"
-    "--size=auto"
-    "--seed=${seed}"
-    "--definitions=${finalAttrs.finalRepartDefinitions}"
-    "--split=${lib.boolToString split}"
-    "--json=pretty"
-  ] ++ lib.optionals createEmpty [
-    "--empty=create"
-  ] ++ lib.optionals (sectorSize != null) [
-    "--sector-size=${toString sectorSize}"
-  ];
+    dontUnpack = true;
+    dontConfigure = true;
+    doCheck = false;

-  dontUnpack = true;
-  dontConfigure = true;
-  doCheck = false;
+    patchPhase = ''
+      runHook prePatch

-  patchPhase = ''
-    runHook prePatch
+      amendedRepartDefinitionsDir=$(${amendRepartDefinitions} <(echo "$partitionsJSON") $definitionsDirectory)
+      ln -vs $amendedRepartDefinitionsDir $finalRepartDefinitions

-    amendedRepartDefinitionsDir=$(${amendRepartDefinitions} <(echo "$partitionsJSON") $definitionsDirectory)
-    ln -vs $amendedRepartDefinitionsDir $finalRepartDefinitions
+      runHook postPatch
+    '';

-    runHook postPatch
-  '';
+    buildPhase = ''
+      runHook preBuild

-  buildPhase = ''
-    runHook preBuild
+      echo "Building image with systemd-repart..."
+      unshare --map-root-user fakeroot systemd-repart \
+        ''${systemdRepartFlags[@]} \
+        ${imageFileBasename}.raw \
+        | tee repart-output.json

-    echo "Building image with systemd-repart..."
-    unshare --map-root-user fakeroot systemd-repart \
-      ''${systemdRepartFlags[@]} \
-      ${imageFileBasename}.raw \
-      | tee repart-output.json
+      runHook postBuild
+    '';

-    runHook postBuild
-  '';
+    installPhase =
+      ''
+        runHook preInstall

-  installPhase = ''
-    runHook preInstall
+        mkdir -p $out
+      ''
+      # Compression is implemented in the same derivation as opposed to in a
+      # separate derivation to allow users to save disk space. Disk images are
+      # already very space intensive so we want to allow users to mitigate this.
+      + lib.optionalString compression.enable ''
+        for f in ${imageFileBasename}*; do
+          echo "Compressing $f with ${compression.algorithm}..."
+          # Keep the original file when compressing and only delete it afterwards
+          ${compressionCommand} $f && rm $f
+        done
+      ''
+      + ''
+        mv -v repart-output.json ${imageFileBasename}* $out

-    mkdir -p $out
-  ''
-  # Compression is implemented in the same derivation as opposed to in a
-  # separate derivation to allow users to save disk space. Disk images are
-  # already very space intensive so we want to allow users to mitigate this.
-  + lib.optionalString compression.enable
-  ''
-    for f in ${imageFileBasename}*; do
-      echo "Compressing $f with ${compression.algorithm}..."
-      # Keep the original file when compressing and only delete it afterwards
-      ${compressionCommand} $f && rm $f
-    done
-  '' + ''
-    mv -v repart-output.json ${imageFileBasename}* $out
+        runHook postInstall
+      '';

-    runHook postInstall
-  '';
-
-  passthru = {
-    inherit amendRepartDefinitions;
-  };
-})
+    passthru = {
+      inherit amendRepartDefinitions;
+    };
+  }
+)