diff options
| author | jeschli <jeschli@gmail.com> | 2018-03-20 15:37:44 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-03-20 15:37:44 +0100 |
| commit | 01358d3947b46c2d9cceb7f6c53855cb536d6efe (patch) | |
| tree | 194c3c5e346327774603f8948a0fa301a082be90 /makefu/source.nix | |
| parent | 390375cd8a0c745eb6b4df93f3f6f3e5f2985c90 (diff) | |
| parent | 6267aa42509a4f56dc95dfc2db7773c33ca12522 (diff) | |
Merge branch 'staging/jeschli' of prism.r:stockholm into staging/jeschli
Diffstat (limited to 'makefu/source.nix')
| -rw-r--r-- | makefu/source.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/makefu/source.nix b/makefu/source.nix index c22c82f32..79a2c535f 100644 --- a/makefu/source.nix +++ b/makefu/source.nix @@ -13,7 +13,13 @@ let then "buildbot" else "makefu"; _file = <stockholm> + "/makefu/1systems/${name}/source.nix"; - ref = "0f19bee"; # nixos-17.09 @ 2018-01-05 + 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 # + signal: 0f19beef3 @@ -41,6 +47,7 @@ in }; stockholm.file = toString <stockholm>; + stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; } (mkIf ( musnix ) { musnix.git = { |