nix-community/disko
1
1
Fork 0
mirror of https://github.com/nix-community/disko.git synced 2024-09-17 09:37:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

diskoNoDeps -> diskoScriptNoDeps

Browse Source
This commit is contained in:
lassulus 2023-06-23 04:57:57 +02:00 committed by mergify[bot]
parent 637d87df3f
commit 8e50c6da0d
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli.nix
View File

@ -19,8 +19,8 @@ let
{
create = "createScriptNoDeps";
mount = "mountScriptNoDeps";
zap_create_mount = "diskoNoDeps";
disko = "diskoNoDeps";
zap_create_mount = "diskoScriptNoDeps";
disko = "diskoScriptNoDeps";
}.${mode}
else
{

8
default.nix
View File

@ -39,7 +39,13 @@ in
export PATH=${lib.makeBinPath (diskoLib.packages (eval cfg).config.disko.devices pkgs)}:$PATH
${diskoLib.zapCreateMount (eval cfg).config.disko.devices}
'';
diskoNoDeps = cfg: pkgs: (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko-zap-create-mount" ''
# we keep this old output for backwards compatibility
diskoNoDeps = cfg: pkgs: builtins.trace "the .diskoNoDeps output is deprecated, plase use .diskoScriptNoDeps instead" (
(diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko-zap-create-mount" ''
${diskoLib.zapCreateMount (eval cfg).config.disko.devices}
''
);
diskoScriptNoDeps = cfg: pkgs: (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko-zap-create-mount" ''
${diskoLib.zapCreateMount (eval cfg).config.disko.devices}
'';
config = cfg: { imports = diskoLib.config (eval cfg).config.disko.devices; };

12
module.nix
View File

@ -48,12 +48,7 @@ in
'';
# we keep this old output for compatibility
system.build.disko = builtins.trace "the .disko output is deprecated, plase use .diskoScript instead" (
(diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko" ''
export PATH=${lib.makeBinPath (diskoLib.packages cfg.devices pkgs)}:$PATH
${diskoLib.zapCreateMount cfg.devices}
''
);
system.build.disko = builtins.trace "the .disko output is deprecated, plase use .diskoScript instead" config.system.build.diskoScript;
system.build.diskoScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko" ''
export PATH=${lib.makeBinPath (diskoLib.packages cfg.devices pkgs)}:$PATH
@ -69,7 +64,10 @@ in
${diskoLib.mount cfg.devices}
'';
system.build.diskoNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko" ''
# we keep this old output for compatibility
system.build.diskoNoDeps = builtins.trace "the .diskoNoDeps output is deprecated, plase use .diskoScriptNoDeps instead" config.system.build.diskoScriptNoDeps;
system.build.diskoScriptNoDeps = (diskoLib.writeCheckedBash { inherit pkgs checked; noDeps = true; }) "disko" ''
${diskoLib.zapCreateMount cfg.devices}
'';