From 27c40e5381275575d9bdb770d2394884399b6c99 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Wed, 15 May 2024 09:57:25 -0700 Subject: [PATCH 1/2] Add missing gawk dependency --- lib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/default.nix b/lib/default.nix index ea618a7..e44c557 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -404,6 +404,7 @@ let bash jq gnused + gawk ])}:$PATH ${cfg.config._destroy} ''; From e9dd5abae3eb5e5d781c88f7abedeacb35b1db4c Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Wed, 15 May 2024 09:57:53 -0700 Subject: [PATCH 2/2] Add coreutils to list of dependencies This allows for the disko scripts to be ran in more foreign environments where we can't assume the basic utilities coreutils provides are available or aren't 1-for-1 compatible (e.g. busybox utilities). --- lib/default.nix | 4 +++- lib/types/btrfs.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index e44c557..1647337 100644 --- 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; @@ -405,6 +406,7 @@ let jq gnused gawk + coreutils-full ])}:$PATH ${cfg.config._destroy} ''; diff --git a/lib/types/btrfs.nix b/lib/types/btrfs.nix index 8b58801..5d30675 100644 --- 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"; }; };