Merge staging-next into staging

2019-01-15 16:59:03 +01:00
parent 1f0467005d ab8e72b7bb
commit 42d276c6b8
167 changed files with 6971 additions and 4962 deletions
--- a/pkgs/development/python-modules/pytestrunner/default.nix
+++ b/pkgs/development/python-modules/pytestrunner/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Invoke py.test as distutils command with dependency resolution";
-    homepage = https://bitbucket.org/pytest-dev/pytest-runner;
+    homepage = https://github.com/pytest-dev/pytest-runner;
    license = licenses.mit;
  };
 }