diff options
| author | lassulus <lassulus@lassul.us> | 2018-03-06 20:21:02 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2018-03-06 20:21:02 +0100 |
| commit | 995d1b0c7cd42966651ca5d5d799b2aad219a978 (patch) | |
| tree | b1dd9a8c9cf5d0a4dd560835c2d62d4b41c7cff5 /makefu | |
| parent | 58a21e21e262c6edea2aefff0d8ca772a7e3ea70 (diff) | |
| parent | 2934d4524bcbae13043d684a27597c8b08c0851b (diff) | |
Merge remote-tracking branch 'prism/tv'
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 708f0d20..79a2c535 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 = { |