Merge staging-next into staging

2019-01-17 09:21:29 +01:00
parent cabe7d6506 379c3899a5
commit 9cfae76fc5
124 changed files with 6367 additions and 3761 deletions
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -10,11 +10,11 @@
 }:
 buildPythonPackage rec {
  pname = "pytest-django";
-  version = "3.4.4";
+  version = "3.4.5";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "07zl2438gavrcykva6i2lpxmzgf90h4xlm3nqgd7wsqz2yh727zy";
+    sha256 = "0dh7jm1d37p54pgc7cx4izz6khsd860a6hw64gx74c8fjfz36p8s";
  };

  nativeBuildInputs = [ pytest setuptools_scm ];