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 | 43a36afc14270764fcc59f91d52a924b66c5fdb7 (patch) | |
| tree | d2439daf8f527fc168fb20a5bceab12f4136ce11 | |
| parent | 13502f36c45f75a0d0b53cac19a85c9d2ea60f4e (diff) | |
| parent | c606fea2741c0db8094d1b4ce9e7102fde8479ce (diff) | |
Merge remote-tracking branch 'prism/tv'
| -rw-r--r-- | source.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source.nix b/source.nix index 708f0d20c..79a2c535f 100644 --- a/source.nix +++ b/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 = { |