about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2024-02-25 11:22:20 -0500
committerGitHub <noreply@github.com>2024-02-25 11:22:20 -0500
commit65de1f4ff2fafbde64b1c39fcd976098a6d08f79 (patch)
treeb0c13b17c44f3cc2971a643682cc47d33c2cff5e /nixos/modules
parentbae116576d9690dffdfa2fb84b2e89d104d7b8c1 (diff)
parentd421b506e5123c66a06e52a1173bb820bcfcead2 (diff)
Merge pull request #287514 from NixOS/backport-256709-to-release-23.11
[Backport release-23.11] nixos/lib/make-squashfs.nix: allow disabling compression
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/installer/cd-dvd/iso-image.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 0b5135c088eaf..6adb94e09aff3 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -512,9 +512,10 @@ in
                 + lib.optionalString isAarch "-Xbcj arm"
                 + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"
                 + lib.optionalString (isSparc) "-Xbcj sparc";
-      type = lib.types.str;
+      type = lib.types.nullOr lib.types.str;
       description = lib.mdDoc ''
         Compression settings to use for the squashfs nix store.
+        `null` disables compression.
       '';
       example = "zstd -Xcompression-level 6";
     };