summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-03-29 19:19:13 +0200
committerlassulus <lassulus@lassul.us>2018-03-29 19:19:13 +0200
commitf0a872fea628ece8576dc3184faf836d81ebc0b1 (patch)
tree1b39efb033280e0f5159821ee9dfab906e451dee
parent23e797744017d984d67ba66d879e35913bbac4d7 (diff)
parenta64238e7660ab92c7dcdf33d13ee4222bfe5eadf (diff)
Merge remote-tracking branch 'gum/master' into staging/18.03
-rw-r--r--krebs/5pkgs/simple/buildbot-classic/default.nix4
-rw-r--r--makefu/1systems/drop/source.nix1
-rw-r--r--makefu/1systems/fileleech/source.nix3
-rw-r--r--makefu/6tests/data/secrets/torrent-secrets/auth.nix1
4 files changed, 5 insertions, 4 deletions
diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix
index 77ba0342d..3cb691f53 100644
--- 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";
diff --git a/makefu/1systems/drop/source.nix b/makefu/1systems/drop/source.nix
index 74de846c0..45bd6f97e 100644
--- 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;
}
diff --git a/makefu/1systems/fileleech/source.nix b/makefu/1systems/fileleech/source.nix
index 699267e21..caca1fbcb 100644
--- 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;
}
diff --git a/makefu/6tests/data/secrets/torrent-secrets/auth.nix b/makefu/6tests/data/secrets/torrent-secrets/auth.nix
deleted file mode 100644
index 0967ef424..000000000
--- a/makefu/6tests/data/secrets/torrent-secrets/auth.nix
+++ /dev/null
@@ -1 +0,0 @@
-{}