diff options
author | makefu <github@syntax-fehler.de> | 2018-03-07 01:49:57 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2018-03-07 01:49:57 +0100 |
commit | 6b647a237a5f4db23b7eff70f305be7106da7711 (patch) | |
tree | 3542eabb416599e0d2dea8a2f2358f27f4b911e2 /krebs/source.nix | |
parent | 194e7011d42ed75c76dc7a7efea450ba6497d2f1 (diff) | |
parent | 02f67eed443ba552d775d1a0ab7860d439f7552b (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/source.nix')
-rw-r--r-- | krebs/source.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/krebs/source.nix b/krebs/source.nix index c2fbbc5f8..7e0ea7e47 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -4,6 +4,11 @@ host@{ name, secure ? false, override ? {} }: let then "buildbot" else "krebs"; _file = <stockholm> + "/krebs/1systems/${name}/source.nix"; + pkgs = import <nixpkgs> { + overlays = map import [ + <stockholm/krebs/5pkgs> + ]; + }; in evalSource (toString _file) [ { @@ -16,9 +21,10 @@ in }; }; stockholm.file = toString <stockholm>; + stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "d09e425aea3e09b6cec5c7b05cc0603f6853748b"; # nixos-17.09 @ 2018-02-22 + ref = "c5bc83b503dfb29eb27c1deb0268f15c1858e7ce"; # nixos-17.09 @ 2018-02-27 }; } override |