krebs/populate.nix -> krebs/v2 populate

1 files changed, 9 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index a35d6d12..d7534e1f 100644
--- a/Makefile
+++ b/Makefile
@@ -33,15 +33,20 @@ deploy2: export target-host = $(target)
 else
 deploy2: export target-host = $(system)
 endif
+deploy2: export source = \
+	with (import ~/stockholm {}).users.$(LOGNAME).$(system).config.krebs.build; \
+	assert source-version == 2; \
+	source
 deploy2:;@
 	target=$${target-$$system}
 	result=$$(nix-instantiate \
-			--json \
 			--eval \
-			krebs/populate.nix \
-			--arg source 'with (import ~/stockholm {}).users.$(LOGNAME).$(system).config.krebs.build; assert source-version == 2; source' \
+			--json \
+			--arg source "$$source" \
 			--argstr target-host "$$target" \
-			--argstr target-path /var/src)
+			--argstr target-path /var/src \
+			-A populate \
+			krebs/v2)
 	script=$$(echo "$$result" | jq -r .)
 	echo "$$script" | sh
 	ssh root@$$target nixos-rebuild switch -I /var/src