technofab/disko
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/disko.git synced 2025-12-11 23:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

4
cli.nix
View file

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

8
default.nix
View file

@ -39,7 +39,13 @@ in
export PATH=${lib.makeBinPath (diskoLib.packages (eval cfg).config.disko.devices pkgs)}:$PATH export PATH=${lib.makeBinPath (diskoLib.packages (eval cfg).config.disko.devices pkgs)}:$PATH
${diskoLib.zapCreateMount (eval cfg).config.disko.devices} ${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} ${diskoLib.zapCreateMount (eval cfg).config.disko.devices}
''; '';
config = cfg: { imports = diskoLib.config (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 # we keep this old output for compatibility
system.build.disko = builtins.trace "the .disko output is deprecated, plase use .diskoScript instead" ( system.build.disko = builtins.trace "the .disko output is deprecated, plase use .diskoScript instead" config.system.build.diskoScript;
(diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko" ''
export PATH=${lib.makeBinPath (diskoLib.packages cfg.devices pkgs)}:$PATH
${diskoLib.zapCreateMount cfg.devices}
''
);
system.build.diskoScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko" '' system.build.diskoScript = (diskoLib.writeCheckedBash { inherit pkgs checked; }) "disko" ''
export PATH=${lib.makeBinPath (diskoLib.packages cfg.devices pkgs)}:$PATH export PATH=${lib.makeBinPath (diskoLib.packages cfg.devices pkgs)}:$PATH
@ -69,7 +64,10 @@ in
${diskoLib.mount cfg.devices} ${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} ${diskoLib.zapCreateMount cfg.devices}
''; '';