Merge pull request #635 from jmbaur/self-contained-deps

Add missing dependencies
nix-community · May 16, 2024 · 5f6dbcc · 5f6dbcc
2 parents 476eef8 + e9dd5ab
commit 5f6dbcc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/default.nix b/lib/default.nix
@@ -385,8 +385,9 @@ let
             internal = true;
             description = ''
               packages required by the disko configuration
+              coreutils is always included
             '';
-            default = pkgs: unique (flatten (map (dev: dev._pkgs pkgs) (flatten (map attrValues (attrValues devices)))));
+            default = pkgs: unique ((flatten (map (dev: dev._pkgs pkgs) (flatten (map attrValues (attrValues devices))))) ++ [ pkgs.coreutils-full ]);
           };
           _scripts = lib.mkOption {
             internal = true;
@@ -404,6 +405,8 @@ let
                   bash
                   jq
                   gnused
+                  gawk
+                  coreutils-full
                 ])}:$PATH
                 ${cfg.config._destroy}
               '';

diff --git a/lib/types/btrfs.nix b/lib/types/btrfs.nix
@@ -219,7 +219,7 @@ in
       readOnly = true;
       type = lib.types.functionTo (lib.types.listOf lib.types.package);
       default = pkgs:
-        [ pkgs.btrfs-progs pkgs.coreutils pkgs.gnugrep ];
+        [ pkgs.btrfs-progs pkgs.gnugrep ];
       description = "Packages";
     };
   };