summaryrefslogtreecommitdiffstats
path: root/nin/source.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-03-07 01:49:57 +0100
committermakefu <github@syntax-fehler.de>2018-03-07 01:49:57 +0100
commit6b647a237a5f4db23b7eff70f305be7106da7711 (patch)
tree3542eabb416599e0d2dea8a2f2358f27f4b911e2 /nin/source.nix
parent194e7011d42ed75c76dc7a7efea450ba6497d2f1 (diff)
parent02f67eed443ba552d775d1a0ab7860d439f7552b (diff)
Merge remote-tracking branch 'lass/master'
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 ccf5e6acc..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,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;
}