diff options
| author | lassulus <lassulus@lassul.us> | 2017-07-17 08:02:01 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-07-17 08:02:01 +0200 |
| commit | ae5fef979de5f0c5c8c1e78f56ddc1f8b4caf5b2 (patch) | |
| tree | 2aea66950046fd3a6bce059e19ce0536a3e8331f /makefu/source.nix | |
| parent | 2d6447d9669ba74780a57dd4ddcdb19110bd4928 (diff) | |
| parent | a3f6c2e49d37eb8d629cac1e8365d5b90a2ccd3c (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/source.nix')
| -rw-r--r-- | makefu/source.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/makefu/source.nix b/makefu/source.nix index a24af4df..02ec2c17 100644 --- a/makefu/source.nix +++ b/makefu/source.nix @@ -1,10 +1,10 @@ with import <stockholm/lib>; -host@{ name, secure ? false, override ? {}, full ? false }: let +host@{ name, secure ? false, override ? {}, full ? false, torrent ? false }: let builder = if getEnv "dummy_secrets" == "true" then "buildbot" else "makefu"; _file = <stockholm> + "/makefu/1systems/${name}/source.nix"; - ref = "06734d1"; # unstable @ 2017-07-03 + graceful requests2 (a772c3aa) + ref = "0751450"; # unstable @ 2017-07-16 + graceful requests2 (a772c3aa) in evalSource (toString _file) [ @@ -29,10 +29,14 @@ in buildbot = toString <stockholm/makefu/6tests/data/secrets>; makefu = "/home/makefu/secrets/${name}"; }; + stockholm.file = toString <stockholm>; } - (mkIf (builder == "makefu") { - secrets-common.file = "/home/makefu/secrets/common"; + (mkIf ( torrent ) { + torrent-secrets.file = getAttr builder { + buildbot = toString <stockholm/makefu/6tests/data/secrets>; + makefu = "/home/makefu/secrets/torrent" ; + }; }) override ] |