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 | f40372edae02126778df858bc93d89b53fe0723f (patch) | |
| tree | 45643c633eb0a759d19340562254092f722b46af /jeschli | |
| parent | a8e30e2c3bb58372d26714e82c7986f22f2be652 (diff) | |
| parent | d7e64aca1718d94c97b6d6378a191ec957047131 (diff) | |
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'jeschli')
| -rw-r--r-- | jeschli/source.nix | 6 |
1 files changed, 6 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 ] |