diff options
author | lassulus <lassulus@lassul.us> | 2017-07-18 17:43:39 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2017-07-18 17:43:39 +0200 |
commit | 714cdec79cf457f304207f443f8b72f64a958d8f (patch) | |
tree | 99a3023fe4a10ae93904b14191d7cae5cd9392a9 /makefu/source.nix | |
parent | 5f743cbd32572a25e0df73b823cd866f1d80f01a (diff) | |
parent | be49befd5239ab2715992e3103bd71327e5a7310 (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/source.nix')
-rw-r--r-- | makefu/source.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/makefu/source.nix b/makefu/source.nix index 02ec2c177..ec86e7f77 100644 --- a/makefu/source.nix +++ b/makefu/source.nix @@ -1,10 +1,17 @@ with import <stockholm/lib>; -host@{ name, secure ? false, override ? {}, full ? false, torrent ? false }: let +host@{ name, + override ? {}, + secure ? false, + full ? false, + torrent ? false, + musnix ? false +}: +let builder = if getEnv "dummy_secrets" == "true" then "buildbot" else "makefu"; _file = <stockholm> + "/makefu/1systems/${name}/source.nix"; - ref = "0751450"; # unstable @ 2017-07-16 + graceful requests2 (a772c3aa) + ref = "74b40c3"; # unstable @ 2017-07-16 + graceful requests2 (a772c3aa) + libpurple bitlbee in evalSource (toString _file) [ @@ -32,6 +39,12 @@ in stockholm.file = toString <stockholm>; } + (mkIf ( musnix ) { + musnix.git = { + url = https://github.com/musnix/musnix.git; + ref = "d8b989f"; + }; + }) (mkIf ( torrent ) { torrent-secrets.file = getAttr builder { buildbot = toString <stockholm/makefu/6tests/data/secrets>; |