Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1525828
2019-06-18 09:41:36 +02:00
parent 7adbdd9758 03acdd20be
commit 0aa9f35a99
855 changed files with 1664 additions and 1409 deletions
--- a/pkgs/development/python-modules/buildbot/worker.nix
+++ b/pkgs/development/python-modules/buildbot/worker.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, python, setuptoolsTrial, mock, twisted, future }:
+{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future }:

 buildPythonPackage (rec {
  pname = "buildbot-worker";