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 /makefu | |
| parent | 194e7011d42ed75c76dc7a7efea450ba6497d2f1 (diff) | |
| parent | 02f67eed443ba552d775d1a0ab7860d439f7552b (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/source.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/makefu/source.nix b/makefu/source.nix index 405740b5..474f7e15 100644 --- a/makefu/source.nix +++ b/makefu/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 = { |