diff options
| author | tv <tv@krebsco.de> | 2018-02-28 14:47:12 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-02-28 15:15:58 +0100 |
| commit | 7c6325d0fbf6c9080f575d7608eb2e1942b52744 (patch) | |
| tree | c12ff0ba908cf47cb09b0f883b15bcd5a8728ac9 | |
| parent | 6169d848f471ad37eaf675bc5ca33d4742ab4c09 (diff) | |
os-release: use <stockholm-version>
| -rw-r--r-- | jeschli/source.nix | 6 | ||||
| -rw-r--r-- | mv/source.nix | 6 | ||||
| -rw-r--r-- | nin/source.nix | 6 | ||||
| -rw-r--r-- | tv/source.nix | 6 |
4 files changed, 24 insertions, 0 deletions
diff --git a/jeschli/source.nix b/jeschli/source.nix index 382dd61..fe1de8f 100644 --- a/jeschli/source.nix +++ b/jeschli/source.nix @@ -4,6 +4,11 @@ host@{ name, secure ? false, override ? {} }: let then "buildbot" else "jeschli"; _file = <stockholm> + "/jeschli/1systems/${name}/source.nix"; + pkgs = import <nixpkgs> { + overlays = map import [ + <stockholm/krebs/5pkgs> + ]; + }; in evalSource (toString _file) [ { @@ -17,6 +22,7 @@ in jeschli = "${getEnv "HOME"}/secrets/${name}"; }; stockholm.file = toString <stockholm>; + stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; } override ] diff --git a/mv/source.nix b/mv/source.nix index 5f6b2fe..1a7b839 100644 --- a/mv/source.nix +++ b/mv/source.nix @@ -4,6 +4,11 @@ host@{ name, override ? {} }: let then "buildbot" else "mv"; _file = <stockholm> + "/mv/1systems/${name}/source.nix"; + pkgs = import <nixpkgs> { + overlays = map import [ + <stockholm/krebs/5pkgs> + ]; + }; in evalSource (toString _file) [ { @@ -18,6 +23,7 @@ in mv = "/home/mv/secrets/${name}"; }; stockholm.file = toString <stockholm>; + stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; } override ] diff --git a/nin/source.nix b/nin/source.nix index ccf5e6a..5f3bbcb 100644 --- a/nin/source.nix +++ b/nin/source.nix @@ -4,6 +4,11 @@ host@{ name, secure ? false }: let then "buildbot" else "nin"; _file = <stockholm> + "/nin/1systems/${name}/source.nix"; + pkgs = import <nixpkgs> { + overlays = map import [ + <stockholm/krebs/5pkgs> + ]; + }; in evalSource (toString _file) { nixos-config.symlink = "stockholm/nin/1systems/${name}/config.nix"; @@ -12,6 +17,7 @@ in nin = "/home/nin/secrets/${name}"; }; stockholm.file = toString <stockholm>; + stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; ref = "afe9649"; diff --git a/tv/source.nix b/tv/source.nix index b5e3f7c..e5e5e04 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"; |