summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-06-27 23:48:05 +0200
committertv <tv@krebsco.de>2017-06-27 23:48:05 +0200
commit62e50105badbe23a3e448d8ca9f5770f7698b22b (patch)
tree22c9fa9ef42cbae61ea2408eff4de051af355fd6
parentee08824427c0a8dbc92aa2858300f7aae5d70df0 (diff)
krebs.build.source: stockholm default is <stockholm>
-rw-r--r--krebs/3modules/build.nix2
-rw-r--r--tv/2configs/default.nix1
2 files changed, 2 insertions, 1 deletions
diff --git a/krebs/3modules/build.nix b/krebs/3modules/build.nix
index 51f192703..976d378f9 100644
--- a/krebs/3modules/build.nix
+++ b/krebs/3modules/build.nix
@@ -24,4 +24,6 @@ with import <stockholm/lib>;
type = types.user;
};
};
+
+ config.krebs.build.source.stockholm.file = mkDefault (toString <stockholm>);
}
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index aae7c5a1b..bab1c72b6 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -15,7 +15,6 @@ in {
tv = "/home/tv/secrets/${host.name}";
};
secrets-common.file = "/home/tv/secrets/common";
- stockholm.file = toString <stockholm>;
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs;
ref = "412b0a17aa2975e092c7ab95a38561c5f82908d4"; # nixos-17.03