diff options
| author | jeschli <jeschli@gmail.com> | 2018-03-13 18:52:07 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-03-13 18:55:44 +0100 |
| commit | 6267aa42509a4f56dc95dfc2db7773c33ca12522 (patch) | |
| tree | 3d9bcb9e7424ebdd04bf8ddcaf96f11626ea351b /makefu/source.nix | |
| parent | e7ac3fc703929cd503bc6a01cad449a5b2c328f2 (diff) | |
| parent | 02f67eed443ba552d775d1a0ab7860d439f7552b (diff) | |
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'makefu/source.nix')
| -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 708f0d20c..79a2c535f 100644 --- a/makefu/source.nix +++ b/makefu/source.nix @@ -13,6 +13,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 = "51810e0"; # nixos-17.09 @ 2018-02-14 # + do_sqlite3 ruby: 55a952be5b5 @@ -42,6 +47,7 @@ in }; stockholm.file = toString <stockholm>; + stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; } (mkIf ( musnix ) { musnix.git = { |