add pkgs.parted where partprobe is needed

nix-community · Sep 12, 2023 · 79785c1 · 79785c1
1 parent 7304727
commit 79785c1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/lib/make-disk-image.nix b/lib/make-disk-image.nix
@@ -18,9 +18,10 @@ let
     bash
     coreutils
     gnused
+    parted # for partprobe
     systemdMinimal
     nix
-    utillinux
+    util-linux
   ];
   preVM = ''
     ${lib.concatMapStringsSep "\n" (disk: "truncate -s ${disk.imageSize} ${disk.name}.raw") (lib.attrValues nixosConfig.config.disko.devices.disk)}

diff --git a/lib/types/gpt.nix b/lib/types/gpt.nix
@@ -146,7 +146,11 @@ in
       readOnly = true;
       type = lib.types.functionTo (lib.types.listOf lib.types.package);
       default = pkgs:
-        [ pkgs.gptfdisk pkgs.systemdMinimal ] ++ lib.flatten (map
+        [
+          pkgs.gptfdisk
+          pkgs.systemdMinimal
+          pkgs.parted # for partprobe
+        ] ++ lib.flatten (map
           (partition:
             lib.optional (partition.content != null) (partition.content._pkgs pkgs)
           )

diff --git a/lib/types/mdadm.nix b/lib/types/mdadm.nix
@@ -74,7 +74,9 @@
       internal = true;
       readOnly = true;
       type = lib.types.functionTo (lib.types.listOf lib.types.package);
-      default = pkgs: (lib.optionals (config.content != null) (config.content._pkgs pkgs));
+      default = pkgs: [
+        pkgs.parted # for partprobe
+      ] ++ (lib.optionals (config.content != null) (config.content._pkgs pkgs));
       description = "Packages";
     };
   };

diff --git a/lib/types/zfs_volume.nix b/lib/types/zfs_volume.nix
@@ -72,7 +72,10 @@
       internal = true;
       readOnly = true;
       type = lib.types.functionTo (lib.types.listOf lib.types.package);
-      default = pkgs: [ pkgs.util-linux ] ++ lib.optionals (config.content != null) (config.content._pkgs pkgs);
+      default = pkgs: [
+        pkgs.util-linux
+        pkgs.parted # for partprobe
+      ] ++ lib.optionals (config.content != null) (config.content._pkgs pkgs);
       description = "Packages";
     };
   };