Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1504357
2019-02-09 10:15:17 +01:00
parent 6ae1cc2e62 baf6ba553f
commit 7f9e3b8206
197 changed files with 5804 additions and 1612 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.5";
+  version = "3.4.6";

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

  nativeBuildInputs = [ pytest setuptools_scm ];