Merge remote-tracking branch 'gum/master' into staging/18.03

2018-03-29 19:19:13 +02:00 · 2018-03-29 19:19:13 +02:00 · f0a872fea6
commit f0a872fea6
parent 23e7977440 a64238e766
4 changed files with 5 additions and 4 deletions
--- a/krebs/5pkgs/simple/buildbot-classic/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic/default.nix
@ -2,7 +2,7 @@

 python2Packages.buildPythonApplication rec {
  name = "buildbot-classic-${version}";
-  version = "0.8.15";
+  version = "0.8.16";
  namePrefix = "";
  patches = [];

@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec {
    owner = "krebscode";
    repo = "buildbot-classic";
    rev = version;
-    sha256 = "0hmmpqxs1i3nvwj9681yi0q3qz0xdcbbm0774lkn1ic5fg3c68fm";
+    sha256 = "0g686n6m0cjfyympl0ksansllx503gby3hx9gmc8hiyx6x5fkjha";
  };
  postUnpack = "sourceRoot=\${sourceRoot}/master";

--- a/makefu/1systems/drop/source.nix
+++ b/makefu/1systems/drop/source.nix
@ -1,3 +1,4 @@
 import <stockholm/makefu/source.nix> {
  name="drop";
+  torrent = true;
 }
--- a/makefu/1systems/fileleech/source.nix
+++ b/makefu/1systems/fileleech/source.nix
@ -1,3 +1,4 @@
 import <stockholm/makefu/source.nix> {
-  name="fileleech";
+  name = "fileleech";
+  torrent = true;
 }
--- a/makefu/6tests/data/secrets/torrent-secrets/auth.nix
+++ b/makefu/6tests/data/secrets/torrent-secrets/auth.nix
@ -1 +0,0 @@
-{}