Merge master into staging

2018-07-22 11:14:41 +02:00
parent 610485faa7 6c72782d36
commit 3209775495
2379 changed files with 66329 additions and 36190 deletions
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildPythonPackage, fetchFromGitHub, python
+{ lib, buildPythonPackage, fetchFromGitHub
 , isPy3k, attrs, coverage, enum34
-, doCheck ? true, pytest, pytest_xdist, flake8, flaky, mock
+, doCheck ? true, pytest, pytest_xdist, flaky, mock
 }:
 buildPythonPackage rec {
  # http://hypothesis.readthedocs.org/en/latest/packaging.html