diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-12-10 10:09:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-10 10:09:05 +0100 |
commit | c6fbf4a15af676068776ff05cc4fc1bfed477b51 (patch) | |
tree | dd2e3d2a2579a696b00a0be68ffaef7e7a96a5f6 | |
parent | b6bf8db29fbb34f9eb582325fb33f854baa7e857 (diff) | |
parent | b56d92a53b7af943566474ec30fb2a22f228e8c2 (diff) | |
download | nixlib-c6fbf4a15af676068776ff05cc4fc1bfed477b51.tar nixlib-c6fbf4a15af676068776ff05cc4fc1bfed477b51.tar.gz nixlib-c6fbf4a15af676068776ff05cc4fc1bfed477b51.tar.bz2 nixlib-c6fbf4a15af676068776ff05cc4fc1bfed477b51.tar.lz nixlib-c6fbf4a15af676068776ff05cc4fc1bfed477b51.tar.xz nixlib-c6fbf4a15af676068776ff05cc4fc1bfed477b51.tar.zst nixlib-c6fbf4a15af676068776ff05cc4fc1bfed477b51.zip |
Merge pull request #32531 from rnhmjoj/dnspython
pythonPackages: rename dns -> dnspython
-rw-r--r-- | pkgs/development/python-modules/FormEncode/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/dkimpy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/dnspython/default.nix (renamed from pkgs/development/python-modules/dns/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/python-modules/email-validator/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 9 |
5 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix index 2f72f7c16a7a..cd9d8ee46d8a 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -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 diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index 91d5a17960d8..177e697aab9f 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -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 \ diff --git a/pkgs/development/python-modules/dns/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 0548c5a1098e..0548c5a1098e 100644 --- a/pkgs/development/python-modules/dns/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 4fc78d8bd1e1..cf03a02129d4 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -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 ]); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 075b33cd087e..607ed3778110 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4553,7 +4553,8 @@ in { 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 {}; @@ -11868,7 +11869,7 @@ in { name = "sleekxmpp-${version}"; version = "1.3.1"; - propagatedBuildInputs = with self ; [ dns pyasn1 ]; + propagatedBuildInputs = with self ; [ dnspython pyasn1 ]; src = pkgs.fetchurl { url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz"; @@ -16729,7 +16730,7 @@ in { buildInputs = with self; [ nose mock pyopenssl ]; - propagatedBuildInputs = with self; [ urllib3 dns]; + propagatedBuildInputs = with self; [ urllib3 dnspython ]; postPatch = '' sed -i '19s/dns/"dnspython"/' setup.py @@ -18599,7 +18600,7 @@ in { nativeBuildInputs = [ pkgs.pkgconfig ]; 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 ]; }; |