From 47c0b0261eabdf230bfc7a375a3a008a04b61c4a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 9 May 2018 11:11:50 +0200
Subject: krebs: 6tests -> 0tests

---
 makefu/source.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'makefu/source.nix')

diff --git a/makefu/source.nix b/makefu/source.nix
index 40aeac8b6..1039ba654 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -45,7 +45,7 @@ in
         };
 
       secrets = getAttr builder {
-        buildbot.file = toString <stockholm/makefu/6tests/data/secrets>;
+        buildbot.file = toString <stockholm/makefu/0tests/data/secrets>;
         makefu.pass = {
           inherit name;
           dir = "${getEnv "HOME"}/.secrets-pass";
@@ -79,7 +79,7 @@ in
 
     (mkIf ( torrent ) {
       torrent-secrets = getAttr builder {
-        buildbot.file = toString <stockholm/makefu/6tests/data/secrets>;
+        buildbot.file = toString <stockholm/makefu/0tests/data/secrets>;
         makefu.pass = {
           name = "torrent";
           dir = "${getEnv "HOME"}/.secrets-pass";
-- 
cgit v1.2.3


From b7c156e5d25f0acf0a430eb1477890482009c51e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 31 May 2018 10:34:46 +0200
Subject: ma source: bump nixpkgs to today

---
 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 40aeac8b6..d956a06cd 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -23,7 +23,7 @@ let
     ];
   };
   # TODO: automate updating of this ref + cherry-picks
-  ref = "a09afbfb8a4"; # nixos-18.03 @ 2018-04-04
+  ref = "a8e3e2cc1f7"; # nixos-18.03 @ 2018-05-31
                        # + do_sqlite3 ruby: 55a952be5b5
 
 in
-- 
cgit v1.2.3


From f6006d7df1fbe2e24b32d945eb55aede97b41886 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 31 May 2018 12:26:53 +0200
Subject: ma source: fix exfat-nofuse build

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

(limited to 'makefu/source.nix')

diff --git a/makefu/source.nix b/makefu/source.nix
index a15edd1aa..56d9095b2 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -23,8 +23,9 @@ let
     ];
   };
   # TODO: automate updating of this ref + cherry-picks
-  ref = "a8e3e2cc1f7"; # nixos-18.03 @ 2018-05-31
-                       # + do_sqlite3 ruby: 55a952be5b5
+  ref = "60b6ab055ad"; # nixos-18.03 @ 2018-05-31
+                       # + do_sqlite3 ruby:   55a952be5b5
+                       # + exfat-nofuse bump: ee6a5296a35
 
 in
   evalSource (toString _file) [
-- 
cgit v1.2.3