Merge pull request #32531 from rnhmjoj/dnspython

pythonPackages: rename dns -> dnspython
This commit is contained in:
Frederik Rietdijk
2017-12-10 10:09:05 +01:00
committed by GitHub
5 changed files with 11 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, dns, pycountry, nose }:
{ stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose }:
buildPythonPackage rec {
pname = "FormEncode";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "1xm77h2mds2prlaz0z4nzkx13g61rx5c2v3vpgjq9d5ij8bzb8md";
};
buildInputs = [ dns pycountry nose ];
buildInputs = [ dnspython pycountry nose ];
patchPhase = ''
# dnspython3 has been superseded, see its PyPI page

View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, openssl, makeWrapper, buildPythonApplication
, pytest, dns }:
, pytest, dnspython }:
buildPythonApplication rec {
name = "${pname}-${version}";
@@ -14,7 +14,7 @@ buildPythonApplication rec {
};
buildInputs = [ pytest ];
propagatedBuildInputs = [ openssl dns ];
propagatedBuildInputs = [ openssl dnspython ];
patchPhase = ''
substituteInPlace dknewkey.py --replace \

View File

@@ -1,4 +1,4 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dns, idna, ipaddress }:
{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }:
buildPythonPackage rec {
pname = "email_validator";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
doCheck = false;
propagatedBuildInputs = [
dns
dnspython
idna
] ++ (if isPy3k then [ ] else [ ipaddress ]);