diff options
| author | jeschli <jeschli@gmail.com> | 2018-03-13 18:52:07 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-03-13 18:55:44 +0100 |
| commit | 6267aa42509a4f56dc95dfc2db7773c33ca12522 (patch) | |
| tree | 3d9bcb9e7424ebdd04bf8ddcaf96f11626ea351b /tv | |
| parent | e7ac3fc703929cd503bc6a01cad449a5b2c328f2 (diff) | |
| parent | 02f67eed443ba552d775d1a0ab7860d439f7552b (diff) | |
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/2configs/gitrepos.nix | 3 | ||||
| -rw-r--r-- | tv/source.nix | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index dc50be4f1..c3418e7ee 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -42,6 +42,9 @@ let { kirk = { cgit.desc = "IRC tools"; }; + kops = { + cgit.desc = "deployment tools"; + }; load-env = {}; loldns = { cgit.desc = "toy DNS server"; diff --git a/tv/source.nix b/tv/source.nix index b5e3f7cd7..e5e5e0413 100644 --- a/tv/source.nix +++ b/tv/source.nix @@ -6,6 +6,11 @@ with import <stockholm/lib>; }@host: let builder = if dummy_secrets then "buildbot" else "tv"; _file = <stockholm> + "/tv/1systems/${name}/source.nix"; + pkgs = import <nixpkgs> { + overlays = map import [ + <stockholm/krebs/5pkgs> + ]; + }; in evalSource (toString _file) [ { @@ -20,6 +25,7 @@ in tv = "/home/tv/secrets/${name}"; }; stockholm.file = toString <stockholm>; + stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; } (mkIf (builder == "tv") { secrets-common.file = "/home/tv/secrets/common"; |