diff options
| author | tv <tv@krebsco.de> | 2016-02-02 01:53:38 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-02-02 01:57:32 +0100 |
| commit | f4ffd242cb788678b7b3bd025bec2b1fc77d3346 (patch) | |
| tree | 16c28852b19f96292dba11042a0e5eb7131addb3 | |
| parent | 7f91bf883686accc7abf049c070b76db7450c779 (diff) | |
krebs/populate.nix -> krebs/v2 populate
| -rw-r--r-- | Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -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 |