summaryrefslogtreecommitdiffstats
path: root/makefu/source.nix
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-06-19 09:22:42 +0200
committerjeschli <jeschli@gmail.com>2018-06-19 09:22:42 +0200
commit8eca9165ce6ffaba1076a916bfa475eb935f0a6f (patch)
treeb2339ecdb48bd1135a1352b9993732ad0e35c02c /makefu/source.nix
parent05c8cf3df5f6166c21dfd2dc316bf5de957dce94 (diff)
parentc19baeee138f9455ef570e609c045d312d6cc0f4 (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'makefu/source.nix')
-rw-r--r--makefu/source.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/makefu/source.nix b/makefu/source.nix
index 40aeac8b6..56d9095b2 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -23,8 +23,9 @@ let
];
};
# TODO: automate updating of this ref + cherry-picks
- ref = "a09afbfb8a4"; # nixos-18.03 @ 2018-04-04
- # + do_sqlite3 ruby: 55a952be5b5
+ ref = "60b6ab055ad"; # nixos-18.03 @ 2018-05-31
+ # + do_sqlite3 ruby: 55a952be5b5
+ # + exfat-nofuse bump: ee6a5296a35
in
evalSource (toString _file) [
@@ -45,7 +46,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 +80,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";