colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages: rename dns -> dnspython

Browse Source
This commit is contained in:
rnhmjoj 2017-12-10 03:15:45 +01:00
parent 4e7deb7100
commit b56d92a53b
No known key found for this signature in database
GPG Key ID: 91BE884FBA4B591A
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/FormEncode/default.nix
View File

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

4
pkgs/development/python-modules/dkimpy/default.nix
View File

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

0
pkgs/development/python-modules/dns/default.nix → pkgs/development/python-modules/dnspython/default.nix
View File

4
pkgs/development/python-modules/email-validator/default.nix
View File

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

9
pkgs/top-level/python-packages.nix
View File

@ -4545,7 +4545,8 @@ in {
discogs_client = callPackage ../development/python-modules/discogs_client { }; discogs_client = callPackage ../development/python-modules/discogs_client { };
dns = callPackage ../development/python-modules/dns { }; dnspython = callPackage ../development/python-modules/dnspython { };
dns = self.dnspython; # Alias for compatibility, 2017-12-10
docker = callPackage ../development/python-modules/docker {}; docker = callPackage ../development/python-modules/docker {};
@ -11851,7 +11852,7 @@ in {
name = "sleekxmpp-${version}"; name = "sleekxmpp-${version}";
version = "1.3.1"; version = "1.3.1";
propagatedBuildInputs = with self ; [ dns pyasn1 ]; propagatedBuildInputs = with self ; [ dnspython pyasn1 ];
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz"; url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz";
@ -16712,7 +16713,7 @@ in {
buildInputs = with self; [ nose mock pyopenssl ]; buildInputs = with self; [ nose mock pyopenssl ];
propagatedBuildInputs = with self; [ urllib3 dns]; propagatedBuildInputs = with self; [ urllib3 dnspython ];
postPatch = '' postPatch = ''
sed -i '19s/dns/"dnspython"/' setup.py sed -i '19s/dns/"dnspython"/' setup.py
@ -18582,7 +18583,7 @@ in {
nativeBuildInputs = [ pkgs.pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ];
propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml python-otr ]; propagatedBuildInputs = with self; [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ];
}; };