summaryrefslogtreecommitdiffstats
path: root/nin/source.nix
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-03-13 18:52:07 +0100
committerjeschli <jeschli@gmail.com>2018-03-13 18:55:44 +0100
commit6267aa42509a4f56dc95dfc2db7773c33ca12522 (patch)
tree3d9bcb9e7424ebdd04bf8ddcaf96f11626ea351b /nin/source.nix
parente7ac3fc703929cd503bc6a01cad449a5b2c328f2 (diff)
parent02f67eed443ba552d775d1a0ab7860d439f7552b (diff)
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'nin/source.nix')
-rw-r--r--nin/source.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/nin/source.nix b/nin/source.nix
index ce1879357..9fb2cb390 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,5 +17,6 @@ in
nin = "/home/nin/secrets/${name}";
};
stockholm.file = toString <stockholm>;
+ stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version";
nixpkgs = (import <stockholm/krebs/source.nix> host).nixpkgs;
}