forked from fediversity/fediversity
Compare commits
4 commits
5146ede6e8
...
4cfe91bcbd
| Author | SHA1 | Date | |
|---|---|---|---|
| 4cfe91bcbd | |||
| f076e5653d | |||
| 404ad12533 | |||
| ba95bae430 |
6 changed files with 12 additions and 20 deletions
|
|
@ -4,10 +4,9 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (import ./constants.nix) pathToRoot pathFromRoot;
|
|
||||||
inherit (pkgs) system;
|
inherit (pkgs) system;
|
||||||
deployment-config = {
|
deployment-config = {
|
||||||
inherit pathToRoot pathFromRoot;
|
inherit (import ./constants.nix) pathToRoot;
|
||||||
nodeName = "ssh";
|
nodeName = "ssh";
|
||||||
targetSystem = system;
|
targetSystem = system;
|
||||||
sshOpts = [ ];
|
sshOpts = [ ];
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,9 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (import ./constants.nix) pathToRoot pathFromRoot;
|
|
||||||
inherit (pkgs) system;
|
inherit (pkgs) system;
|
||||||
deployment-config = {
|
deployment-config = {
|
||||||
inherit pathToRoot pathFromRoot;
|
inherit (import ./constants.nix) pathToRoot;
|
||||||
nodeName = "target";
|
nodeName = "target";
|
||||||
targetSystem = system;
|
targetSystem = system;
|
||||||
sshOpts = [ ];
|
sshOpts = [ ];
|
||||||
|
|
|
||||||
|
|
@ -11,15 +11,9 @@ let
|
||||||
};
|
};
|
||||||
modules = [ configuration ];
|
modules = [ configuration ];
|
||||||
};
|
};
|
||||||
toplevel =
|
in
|
||||||
{
|
{
|
||||||
inherit (eval) pkgs config options;
|
inherit (eval) pkgs config options;
|
||||||
system = eval.config.system.build.toplevel;
|
system = eval.config.system.build.toplevel;
|
||||||
inherit (eval.config.system.build) vm vmWithBootLoader;
|
inherit (eval.config.system.build) vm vmWithBootLoader;
|
||||||
}
|
|
||||||
.config.system.build.toplevel;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
drv_path = toplevel.drvPath;
|
|
||||||
out_path = toplevel;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,13 +24,13 @@ command=(nix-instantiate --show-trace "${nixos_conf}")
|
||||||
|
|
||||||
# INSTANTIATE
|
# INSTANTIATE
|
||||||
# instantiate the config in /nix/store
|
# instantiate the config in /nix/store
|
||||||
"${command[@]}" -A out_path
|
"${command[@]}" -A config.system.build.toplevel
|
||||||
|
|
||||||
# get the realized derivation to deploy
|
# get the realized derivation so we can deploy it
|
||||||
"${command[@]}" --show-trace --eval --strict --json
|
"${command[@]}" -A config.system.build.toplevel --eval --strict --json
|
||||||
|
|
||||||
# FIXME explore import/readFile as ways to instantiate the derivation, potentially allowing to realize the store path up-front from Nix?
|
# FIXME explore import/readFile as ways to instantiate the derivation, potentially allowing to realize the store path up-front from Nix?
|
||||||
outPath=$(nix-store --realize "$("${command[@]}" --show-trace --eval --strict --json | jq -r '.drv_path')")
|
outPath=$(nix-store --realize "$("${command[@]}" -A config.system.build.toplevel.drvPath --eval --strict --json | jq -r '.')")
|
||||||
# deploy the config by nix-copy-closure
|
# deploy the config by nix-copy-closure
|
||||||
NIX_SSHOPTS="${sshOpts[*]}" nix-copy-closure --to "$destination" "$outPath" --gzip --use-substitutes
|
NIX_SSHOPTS="${sshOpts[*]}" nix-copy-closure --to "$destination" "$outPath" --gzip --use-substitutes
|
||||||
# switch the remote host to the config
|
# switch the remote host to the config
|
||||||
|
|
|
||||||
|
|
@ -173,7 +173,7 @@ grab_vm_options () {
|
||||||
printf 'Grabing VM options for VM %s...\n' "$vm_name"
|
printf 'Grabing VM options for VM %s...\n' "$vm_name"
|
||||||
|
|
||||||
options=$(
|
options=$(
|
||||||
nix eval \
|
nix --extra-experimental-features 'nix-command flakes' eval \
|
||||||
--impure --raw --expr "
|
--impure --raw --expr "
|
||||||
builtins.toJSON (builtins.getFlake (builtins.toString ./.)).vmOptions.$vm_name
|
builtins.toJSON (builtins.getFlake (builtins.toString ./.)).vmOptions.$vm_name
|
||||||
" \
|
" \
|
||||||
|
|
@ -221,7 +221,7 @@ build_iso () {
|
||||||
nix_host_keys=
|
nix_host_keys=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
nix build \
|
nix --extra-experimental-features 'nix-command flakes' build \
|
||||||
--impure --expr "
|
--impure --expr "
|
||||||
let flake = builtins.getFlake (builtins.toString ./.); in
|
let flake = builtins.getFlake (builtins.toString ./.); in
|
||||||
import ./infra/makeInstallerIso.nix {
|
import ./infra/makeInstallerIso.nix {
|
||||||
|
|
|
||||||
|
|
@ -161,7 +161,7 @@ grab_vm_options () {
|
||||||
printf 'Grabing VM options for VM %s...\n' "$vm_name"
|
printf 'Grabing VM options for VM %s...\n' "$vm_name"
|
||||||
|
|
||||||
options=$(
|
options=$(
|
||||||
nix eval \
|
nix --extra-experimental-features 'nix-command flakes' eval \
|
||||||
--impure --raw --expr "
|
--impure --raw --expr "
|
||||||
builtins.toJSON (builtins.getFlake (builtins.toString ./.)).vmOptions.$vm_name
|
builtins.toJSON (builtins.getFlake (builtins.toString ./.)).vmOptions.$vm_name
|
||||||
" \
|
" \
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue