run nixfmt-rfc-style

NixOS · Sep 5, 2024 · 04fadac · 04fadac
1 parent 8b16862
commit 04fadac
Show file tree

Hide file tree

Showing 13 changed files with 1,492 additions and 1,190 deletions.
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -1,24 +1,35 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
 
 let
- inherit (lib) mkOption optionalString types versionAtLeast;
+ inherit (lib)
+ mkOption
+ optionalString
+ types
+ versionAtLeast
+ ;
  inherit (lib.options) literalExpression;
  cfg = config.amazonImage;
  amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios";
 
-in {
+in
+{
 
  imports = [ ../../../modules/virtualisation/amazon-image.nix ];
 
  # Amazon recommends setting this to the highest possible value for a good EBS
  # experience, which prior to 4.15 was 255.
  # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes
  config.boot.kernelParams =
- let timeout =
- if versionAtLeast config.boot.kernelPackages.kernel.version "4.15"
- then "4294967295"
-  else "255";
- in [ "nvme_core.io_timeout=${timeout}" ];
+ let
+ timeout =
+  if versionAtLeast config.boot.kernelPackages.kernel.version "4.15" then "4294967295" else "255";
+ in
+ [ "nvme_core.io_timeout=${timeout}" ];
 
  options.amazonImage = {
  name = mkOption {
@@ -34,7 +45,7 @@ in {
  }
  ]
  '';
- default = [];
+ default = [ ];
  description = ''
  This option lists files to be copied to fixed locations in the
  generated image. Glob patterns work.
@@ -49,15 +60,19 @@ in {
  };
 
  format = mkOption {
- type = types.enum [ "raw" "qcow2" "vpc" ];
+ type = types.enum [
+ "raw"
+ "qcow2"
+ "vpc"
+ ];
  default = "vpc";
  description = "The image format to output";
  };
  };
 
- config.system.build.amazonImage = let
- configFile = pkgs.writeText "configuration.nix"
- ''
+ config.system.build.amazonImage =
+ let
+ configFile = pkgs.writeText "configuration.nix" ''
  { modulesPath, ... }: {
  imports = [ "''${modulesPath}/virtualisation/amazon-image.nix" ];
  ${optionalString config.ec2.efi ''
@@ -70,91 +85,102 @@ in {
  }
  '';
 
- zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix {
- inherit lib config configFile pkgs;
- inherit (cfg) contents format name;
-
- includeChannel = true;
-
- bootSize = 1000; # 1G is the minimum EBS volume
-
- rootSize = cfg.sizeMB;
- rootPoolProperties = {
- ashift = 12;
- autoexpand = "on";
+ zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix {
+ inherit
+ lib
+ config
+ configFile
+ pkgs
+ ;
+ inherit (cfg) contents format name;
+
+ includeChannel = true;
+
+ bootSize = 1000; # 1G is the minimum EBS volume
+
+ rootSize = cfg.sizeMB;
+ rootPoolProperties = {
+ ashift = 12;
+ autoexpand = "on";
+ };
+
+ datasets = config.ec2.zfs.datasets;
+
+ postVM = ''
+ extension=''${rootDiskImage##*.}
+ friendlyName=$out/${cfg.name}
+ rootDisk="$friendlyName.root.$extension"
+ bootDisk="$friendlyName.boot.$extension"
+ mv "$rootDiskImage" "$rootDisk"
+ mv "$bootDiskImage" "$bootDisk"
+
+ mkdir -p $out/nix-support
+ echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products
+ echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products
+
+ ${pkgs.jq}/bin/jq -n \
+ --arg system_label ${lib.escapeShellArg config.system.nixos.label} \
+ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
+ --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
+ --arg boot_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
+ --arg boot_mode "${amiBootMode}" \
+ --arg root "$rootDisk" \
+ --arg boot "$bootDisk" \
+ '{}
+ | .label = $system_label
+ | .boot_mode = $boot_mode
+ | .system = $system
+ | .disks.boot.logical_bytes = $boot_logical_bytes
+ | .disks.boot.file = $boot
+ | .disks.root.logical_bytes = $root_logical_bytes
+ | .disks.root.file = $root
+ ' > $out/nix-support/image-info.json
+ '';
  };
 
- datasets = config.ec2.zfs.datasets;
-
- postVM = ''
- extension=''${rootDiskImage##*.}
- friendlyName=$out/${cfg.name}
- rootDisk="$friendlyName.root.$extension"
- bootDisk="$friendlyName.boot.$extension"
- mv "$rootDiskImage" "$rootDisk"
- mv "$bootDiskImage" "$bootDisk"
-
- mkdir -p $out/nix-support
- echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products
- echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products
-
- ${pkgs.jq}/bin/jq -n \
- --arg system_label ${lib.escapeShellArg config.system.nixos.label} \
- --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
- --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
- --arg boot_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
- --arg boot_mode "${amiBootMode}" \
- --arg root "$rootDisk" \
- --arg boot "$bootDisk" \
- '{}
- | .label = $system_label
- | .boot_mode = $boot_mode
- | .system = $system
- | .disks.boot.logical_bytes = $boot_logical_bytes
- | .disks.boot.file = $boot
- | .disks.root.logical_bytes = $root_logical_bytes
- | .disks.root.file = $root
- ' > $out/nix-support/image-info.json
- '';
- };
-
- extBuilder = import ../../../lib/make-disk-image.nix {
- inherit lib config configFile pkgs;
-
- inherit (cfg) contents format name;
-
- fsType = "ext4";
- partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt";
-
- diskSize = cfg.sizeMB;
-
- postVM = ''
- extension=''${diskImage##*.}
- friendlyName=$out/${cfg.name}.$extension
- mv "$diskImage" "$friendlyName"
- diskImage=$friendlyName
-
- mkdir -p $out/nix-support
- echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products
-
- ${pkgs.jq}/bin/jq -n \
- --arg system_label ${lib.escapeShellArg config.system.nixos.label} \
- --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
- --arg logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
- --arg boot_mode "${amiBootMode}" \
- --arg file "$diskImage" \
- '{}
- | .label = $system_label
- | .boot_mode = $boot_mode
- | .system = $system
- | .logical_bytes = $logical_bytes
- | .file = $file
- | .disks.root.logical_bytes = $logical_bytes
- | .disks.root.file = $file
- ' > $out/nix-support/image-info.json
- '';
- };
- in if config.ec2.zfs.enable then zfsBuilder else extBuilder;
+ extBuilder = import ../../../lib/make-disk-image.nix {
+ inherit
+ lib
+ config
+ configFile
+ pkgs
+ ;
+
+ inherit (cfg) contents format name;
+
+ fsType = "ext4";
+ partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt";
+
+ diskSize = cfg.sizeMB;
+
+ postVM = ''
+ extension=''${diskImage##*.}
+ friendlyName=$out/${cfg.name}.$extension
+ mv "$diskImage" "$friendlyName"
+ diskImage=$friendlyName
+
+ mkdir -p $out/nix-support
+ echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products
+
+ ${pkgs.jq}/bin/jq -n \
+ --arg system_label ${lib.escapeShellArg config.system.nixos.label} \
+ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
+ --arg logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
+ --arg boot_mode "${amiBootMode}" \
+ --arg file "$diskImage" \
+ '{}
+ | .label = $system_label
+ | .boot_mode = $boot_mode
+ | .system = $system
+ | .logical_bytes = $logical_bytes
+ | .file = $file
+ | .disks.root.logical_bytes = $logical_bytes
+ | .disks.root.file = $file
+ ' > $out/nix-support/image-info.json
+ '';
+ };
+ in
+ if config.ec2.zfs.enable then zfsBuilder else extBuilder;
 
  meta.maintainers = with lib.maintainers; [ arianvp ];
 }
diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
@@ -1,6 +1,11 @@
 # nix-build '<nixpkgs/nixos>' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }"
 
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
 let
  inherit (lib) mkOption types;
  copyChannel = true;
@@ -12,7 +17,6 @@ in
  ../../../modules/virtualisation/openstack-config.nix
  ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix);
 
-
  options.openstackImage = {
  name = mkOption {
  type = types.str;
@@ -33,7 +37,10 @@ in
  };
 
  format = mkOption {
- type = types.enum [ "raw" "qcow2" ];
+ type = types.enum [
+ "raw"
+ "qcow2"
+ ];
  default = "qcow2";
  description = "The image format to output";
  };
@@ -59,13 +66,12 @@ in
  inherit (cfg) contents format name;
  pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
 
- configFile = pkgs.writeText "configuration.nix"
- ''
- { modulesPath, ... }: {
- imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ];
- openstack.zfs.enable = true;
- }
- '';
+ configFile = pkgs.writeText "configuration.nix" ''
+ { modulesPath, ... }: {
+ imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ];
+ openstack.zfs.enable = true;
+ }
+ '';
 
  includeChannel = copyChannel;