Merge commit 'a0f8e3a' into HEAD

2018-01-22 16:08:37 +01:00
parent 92c0720be9 a0f8e3a30c
commit 4c88132d25
102 changed files with 836 additions and 608 deletions
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchurl
+, fetchPypi
 , buildPythonPackage
 , cython
 , pytest, psutil, pytestrunner
@@ -7,13 +7,13 @@
 }:

 let
+
+in buildPythonPackage rec {
  pname = "multidict";
  version = "4.0.0";
-in buildPythonPackage rec {
-  name = "${pname}-${version}";

-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
    sha256 = "0y0pg3r9hlknny0zwg906wz81h8in6lgvnpbmzvl911bmnrqc95p";
  };