summaryrefslogtreecommitdiffstats
path: root/lass/source.nix
diff options
context:
space:
mode:
authorMarkus Hihn <markus.hihn@dcso.de>2017-12-20 21:38:35 +0100
committerMarkus Hihn <markus.hihn@dcso.de>2017-12-20 21:38:35 +0100
commit03fde41b6c223e65363df43a26e735459a3cf92a (patch)
tree9c7e4d6cc9444c3fff936bcc21c4580d53c5fcab /lass/source.nix
parentb1983327610628028021374e519baa27dc63d9bf (diff)
parenta5d7056ccba9fb5f3495390ad1213e133e44fa78 (diff)
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'lass/source.nix')
-rw-r--r--lass/source.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/lass/source.nix b/lass/source.nix
index 710bfdf2d..bf992d4d2 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -10,11 +10,14 @@ in
nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
- ref = "cb751f9";
+ ref = "af7e479";
};
- secrets.file = getAttr builder {
- buildbot = toString <stockholm/lass/2configs/tests/dummy-secrets>;
- lass = "/home/lass/secrets/${name}";
+ secrets = getAttr builder {
+ buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>;
+ lass.pass = {
+ dir = "${getEnv "HOME"}/.password-store";
+ name = "hosts/${name}";
+ };
};
stockholm.file = toString <stockholm>;
}
[cgit] Unable to lock slot /tmp/cgit/11300000.lock: No such file or directory (2)