mirror of
https://cgit.krebsco.de/krops
synced 2024-11-26 21:19:47 +01:00
krops writeDeploy: deprecate fast parameter
This commit is contained in:
parent
a3bda5c49b
commit
c1b24328c4
1 changed files with 19 additions and 29 deletions
|
@ -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,15 +56,12 @@ in
|
||||||
else lib.mkTarget buildTarget;
|
else lib.mkTarget buildTarget;
|
||||||
target' = lib.mkTarget target;
|
target' = lib.mkTarget target;
|
||||||
in
|
in
|
||||||
|
lib.traceIf (fast != null) "writeDeploy: it's now always fast, setting the `fast` attribute is deprecated and will be removed in future" (
|
||||||
writers.writeDash name ''
|
writers.writeDash name ''
|
||||||
set -efu
|
set -efu
|
||||||
${lib.optionalString (buildTarget' != target')
|
${lib.optionalString (buildTarget' != target')
|
||||||
(populate { inherit backup force source; target = buildTarget'; })}
|
(populate { inherit backup force source; target = buildTarget'; })}
|
||||||
${populate { inherit backup force source; target = target'; }}
|
${populate { inherit backup force source; target = target'; }}
|
||||||
${lib.optionalString (! fast) ''
|
|
||||||
${rebuild ["dry-build"] buildTarget'}
|
|
||||||
${build buildTarget'}
|
|
||||||
''}
|
|
||||||
${rebuild ([
|
${rebuild ([
|
||||||
"switch"
|
"switch"
|
||||||
] ++ lib.optionals crossDeploy [
|
] ++ lib.optionals crossDeploy [
|
||||||
|
@ -83,7 +72,8 @@ in
|
||||||
] ++ lib.optionals target'.sudo [
|
] ++ lib.optionals target'.sudo [
|
||||||
"--use-remote-sudo"
|
"--use-remote-sudo"
|
||||||
]) buildTarget'}
|
]) buildTarget'}
|
||||||
'';
|
''
|
||||||
|
);
|
||||||
|
|
||||||
writeTest = name: {
|
writeTest = name: {
|
||||||
backup ? false,
|
backup ? false,
|
||||||
|
|
Loading…
Reference in a new issue