From 872c75a4255508ce24a0777e4fbfe744a77d1d30 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 16 Jul 2017 15:16:45 +0200
Subject: ma: move torrent secrets to source.nix

---
 makefu/source.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'makefu/source.nix')

diff --git a/makefu/source.nix b/makefu/source.nix
index a24af4df..586b9c22 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -1,5 +1,5 @@
 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";
@@ -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
   ]
-- 
cgit v1.2.3


From 99075e35f1f4b24ed3fa84546d5c02ecdc18980d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 16 Jul 2017 16:09:47 +0200
Subject: ma source: bump nixpkgs to 0751450

---
 makefu/source.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/source.nix')

diff --git a/makefu/source.nix b/makefu/source.nix
index 586b9c22..02ec2c17 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -4,7 +4,7 @@ host@{ name, secure ? false, override ? {}, full ? false, torrent ? false }: let
               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) [
-- 
cgit v1.2.3