eeva
/
krops
mirror of https://cgit.krebsco.de/krops
1
0
Fork 0
Code Issues Releases Wiki Activity

krops writeDeploy: deprecate fast parameter

This commit is contained in:
lassulus 2021-10-25 16:05:12 +02:00
parent a3bda5c49b
commit c1b24328c4
1 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pkgs/krops/default.nix
View File

@ -4,14 +4,6 @@ in
{ nix, openssh, populate, writers }: rec { { nix, openssh, populate, writers }: rec {
build = target:
runShell target (lib.concatStringsSep " " [
"nix build"
"-I ${lib.escapeShellArg target.path}"
"--no-link -f '<nixpkgs/nixos>'"
"config.system.build.toplevel"
]);
rebuild = args: target: rebuild = args: target:
runShell target "nixos-rebuild -I ${lib.escapeShellArg target.path} ${ runShell target "nixos-rebuild -I ${lib.escapeShellArg target.path} ${
lib.concatMapStringsSep " " lib.escapeShellArg args lib.concatMapStringsSep " " lib.escapeShellArg args
@ -53,7 +45,7 @@ in
backup ? false, backup ? false,
buildTarget ? null, buildTarget ? null,
crossDeploy ? false, crossDeploy ? false,
fast ? false, fast ? null,
force ? false, force ? false,
source, source,
target target
@ -64,26 +56,24 @@ in
else lib.mkTarget buildTarget; else lib.mkTarget buildTarget;
target' = lib.mkTarget target; target' = lib.mkTarget target;
in in
writers.writeDash name '' lib.traceIf (fast != null) "writeDeploy: it's now always fast, setting the `fast` attribute is deprecated and will be removed in future" (
set -efu writers.writeDash name ''
${lib.optionalString (buildTarget' != target') set -efu
(populate { inherit backup force source; target = buildTarget'; })} ${lib.optionalString (buildTarget' != target')
${populate { inherit backup force source; target = target'; }} (populate { inherit backup force source; target = buildTarget'; })}
${lib.optionalString (! fast) '' ${populate { inherit backup force source; target = target'; }}
${rebuild ["dry-build"] buildTarget'} ${rebuild ([
${build buildTarget'} "switch"
''} ] ++ lib.optionals crossDeploy [
${rebuild ([ "--no-build-nix"
"switch" ] ++ lib.optionals (buildTarget' != target') [
] ++ lib.optionals crossDeploy [ "--build-host" "${buildTarget'.user}@${buildTarget'.host}"
"--no-build-nix" "--target-host" "${target'.user}@${target'.host}"
] ++ lib.optionals (buildTarget' != target') [ ] ++ lib.optionals target'.sudo [
"--build-host" "${buildTarget'.user}@${buildTarget'.host}" "--use-remote-sudo"
"--target-host" "${target'.user}@${target'.host}" ]) buildTarget'}
] ++ lib.optionals target'.sudo [ ''
"--use-remote-sudo" );
]) buildTarget'}
'';
writeTest = name: { writeTest = name: {
backup ? false, backup ? false,