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 | c192be6e0ffff777cd054ce0bc5f472ced6b4be9 (patch) | |
| tree | 7b55f7e20c737e421d06621986f393f18ff39521 | |
| parent | e2652153baba3d242b18c980c50a306a0f5a6ba5 (diff) | |
| parent | c32cd8b061753dc68a8b8a8f27edeaa5fa077f8e (diff) | |
Merge remote-tracking branch 'lass/master'
| -rw-r--r-- | source.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source.nix b/source.nix index 405740b5c..474f7e15b 100644 --- a/source.nix +++ b/source.nix @@ -14,6 +14,11 @@ let then "buildbot" else "makefu"; _file = <stockholm> + "/makefu/1systems/${name}/source.nix"; + pkgs = import <nixpkgs> { + overlays = map import [ + <stockholm/krebs/5pkgs> + ]; + }; # TODO: automate updating of this ref + cherry-picks ref = "6b6e72b"; # nixos-17.09 @ 2018-03-07 # + do_sqlite3 ruby: 55a952be5b5 @@ -43,6 +48,7 @@ in }; stockholm.file = toString <stockholm>; + stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; } (mkIf ( musnix ) { musnix.git = { |