summaryrefslogtreecommitdiffstats
path: root/nin/source.nix
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-03-20 15:37:44 +0100
committerjeschli <jeschli@gmail.com>2018-03-20 15:37:44 +0100
commit1a24eda531554bc14db80101b82001eae390219a (patch)
treed08d1f32647a760ec641cc70897628b9bb56e264 /nin/source.nix
parent651060327e5e7fb5d0f8b634a65ccf006bd2fe15 (diff)
parentf40372edae02126778df858bc93d89b53fe0723f (diff)
Merge branch 'staging/jeschli' of prism.r:stockholm into staging/jeschli
Diffstat (limited to 'nin/source.nix')
-rw-r--r--nin/source.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/nin/source.nix b/nin/source.nix
index ccf5e6a..9fb2cb3 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,8 +17,6 @@ in
nin = "/home/nin/secrets/${name}";
};
stockholm.file = toString <stockholm>;
- nixpkgs.git = {
- url = https://github.com/nixos/nixpkgs;
- ref = "afe9649";
- };
+ stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version";
+ nixpkgs = (import <stockholm/krebs/source.nix> host).nixpkgs;
}