summaryrefslogtreecommitdiffstats
path: root/krebs/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-02-01 15:17:16 +0100
committerlassulus <lass@aidsballs.de>2016-02-01 15:17:16 +0100
commit72dc2dd7fa54c77e08052efed21f68758fa533a2 (patch)
treef2c4e93c670764134913408a6d43c2ff6c6ac15e /krebs/default.nix
parent186d5cc95a7430136da3107734409511c64d7080 (diff)
parent1a5a3c0cf2aba173772765c24a0865bb2da6b691 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/default.nix')
-rw-r--r--krebs/default.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/krebs/default.nix b/krebs/default.nix
index 15d0e8e2e..df2d95483 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -171,9 +171,12 @@ let out = {
${b}
'';
- get-config = system:
- stockholm.users.${current-user-name}.${system}.config
+ get-config = system: let
+ config = stockholm.users.${current-user-name}.${system}.config
or (abort "unknown system: ${system}, user: ${current-user-name}");
+ in
+ assert config.krebs.build.source-version == 1;
+ config;
nix-install =
{ system ? current-host-name
@@ -240,7 +243,7 @@ let out = {
--exclude tmp \
--rsync-path='mkdir -p ${target-path} && rsync' \
--delete-excluded \
- -vrLptgoD \
+ -vrlptD \
${config.path}/ \
root@${target}:${target-path}
'';