diff options
| author | jeschli <jeschli@gmail.com> | 2017-12-06 16:13:18 +0000 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2017-12-06 16:13:18 +0000 |
| commit | dc3723cf8fa6abfc0538743f66d7b5c2a7371a95 (patch) | |
| tree | 0f8725dadd53e3c07e9bfa6d8cc0091f1ef1aa3d /krebs/3modules | |
| parent | 29f9d3b86926916df63d4525f909316df5638f86 (diff) | |
| parent | 1d6525a0050509ba1aa0b9ab66b8eb84946b8652 (diff) | |
Merge branch 'master' of http://cgit.lassul.us/stockholm into klauen-von-lass
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/ci.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/default.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index adbc1ebe1..b56f5c543 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -104,7 +104,7 @@ in "dummy_secrets": "true", }, command=[ - "nix-shell", "--run", " ".join(["test", + "nix-shell", "-I", "stockholm=.", "--run", " ".join(["test", "--user={}".format(user), "--system={}".format(host), "--force-populate", diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index a8933e719..7cf02cd8b 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -61,6 +61,7 @@ let hosts = mkOption { type = with types; attrsOf host; + default = {}; }; users = mkOption { |