diff options
| author | lassulus <lassulus@lassul.us> | 2018-03-06 20:21:02 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2018-03-06 20:21:02 +0100 |
| commit | 995d1b0c7cd42966651ca5d5d799b2aad219a978 (patch) | |
| tree | b1dd9a8c9cf5d0a4dd560835c2d62d4b41c7cff5 /tv | |
| parent | 58a21e21e262c6edea2aefff0d8ca772a7e3ea70 (diff) | |
| parent | 2934d4524bcbae13043d684a27597c8b08c0851b (diff) | |
Merge remote-tracking branch 'prism/tv'prism/staging/tv
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"; |