Merge master into staging-next

2019-06-26 13:22:30 +02:00
parent 3fc7e97d5c 8df753c598
commit d843e16cb8
96 changed files with 454 additions and 495 deletions
--- a/pkgs/development/python-modules/execnet/default.nix
+++ b/pkgs/development/python-modules/execnet/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
-    sha256 = "752a3786f17416d491f833a29217dda3ea4a471fc5269c492eebcee8cc4772d3";
+    sha256 = "1lvj8z6fikpb5r4rq9n53x3lmsm3vlbr58ikz28x85kly633fakm";
  };

  checkInputs = [ pytest ];