colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

flake: add a preDeploy target

Browse Source
This commit is contained in:
Colin
2024-02-03 02:01:17 +00:00
parent 2dc6da476b
commit 6da85f6d8f
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
flake.nix
View File

@@ -262,7 +262,7 @@
sudo nix sign-paths -r -k /run/secrets/nix_serve_privkey "$storePath" sudo nix sign-paths -r -k /run/secrets/nix_serve_privkey "$storePath"
# N.B.: `--fast` option here is critical to cross-compiled deployments: without it the build machine will try to invoke the host machine's `nix` binary. # N.B.: `--fast` option here is critical to cross-compiled deployments: without it the build machine will try to invoke the host machine's `nix` binary.
# nixos-rebuild --flake '.#${host}' '${action}' --target-host colin@${addr} --use-remote-sudo "$@" --fast # nixos-rebuild --flake '.#${host}' <action> --target-host colin@${addr} --use-remote-sudo "$@" --fast
# instead of `nixos-rebuild --target-host`, recreate its main parts in-line, below. # instead of `nixos-rebuild --target-host`, recreate its main parts in-line, below.
# the benefit is fewer nix evals, and more granularity for debugging/tweaking. # the benefit is fewer nix evals, and more granularity for debugging/tweaking.
# `nixos-rebuild --target-host` effectively does: # `nixos-rebuild --target-host` effectively does:
@@ -273,8 +273,10 @@
# add more `-v` for more verbosity (up to 5). # add more `-v` for more verbosity (up to 5).
# i copy the closure here separately from the nixos-rebuild mostly for the sake of introspectability. # i copy the closure here separately from the nixos-rebuild mostly for the sake of introspectability.
nix-copy-closure -v --gzip --to '${host}' "$storePath" nix-copy-closure -v --gzip --to '${host}' "$storePath"
${pkgs.lib.optionalString (action != null) ''
ssh '${host}' sudo nix-env -p /nix/var/nix/profiles/system --set "$storePath" ssh '${host}' sudo nix-env -p /nix/var/nix/profiles/system --set "$storePath"
ssh '${host}' sudo "$storePath/bin/switch-to-configuration" '${action}' ssh '${host}' sudo "$storePath/bin/switch-to-configuration" '${action}'
''}
''; '';
deployApp = host: addr: action: { deployApp = host: addr: action: {
type = "app"; type = "app";
@@ -348,7 +350,11 @@
- `nix run '.#update.feeds'` - `nix run '.#update.feeds'`
- updates metadata for all feeds - updates metadata for all feeds
- `nix run '.#init-feed' <url>` - `nix run '.#init-feed' <url>`
- `nix run '.#deploy.{desko,lappy,moby,servo}[-light][.test]' [nixos-rebuild args ...]` - `nix run '.#deploy.{desko,lappy,moby,servo}[-light|-test]' [nix args ...]`
- build and deploy the host
- `nix run '.#preDeploy.{desko,lappy,moby,servo}[-light]' [nix args ...]`
- copy closures to a host, but don't activate it
- or `nix run '.#preDeploy'` to target all hosts
- `nix run '.#check'` - `nix run '.#check'`
- make sure all systems build; NUR evaluates - make sure all systems build; NUR evaluates
@@ -384,6 +390,23 @@
moby-test = deployApp "moby" "moby" "test"; moby-test = deployApp "moby" "moby" "test";
servo = deployApp "servo" "servo" "switch"; servo = deployApp "servo" "servo" "switch";
}; };
preDeploy = {
# build the host and copy the runtime closure to that host, but don't activate it.
lappy = deployApp "lappy" "lappy" null;
lappy-light = deployApp "lappy-light" "lappy" null;
moby = deployApp "moby" "moby" null;
moby-light = deployApp "moby-light" "moby" null;
servo = deployApp "servo" "servo" null;
type = "app";
program = builtins.toString (pkgs.writeShellScript "predeploy-all" ''
# copy the -light variants first; this might be run while waiting on a full build. or the full build failed.
nix run '.#preDeploy.moby-light' -- "$@"
nix run '.#preDeploy.lappy-light' -- "$@"
nix run '.#preDeploy.lappy' -- "$@"
nix run '.#preDeploy.servo' -- "$@"
nix run '.#preDeploy.moby' -- "$@"
'');
};
sync = { sync = {
type = "app"; type = "app";