From 411fe648bdac72b7aaf85c1c1a2d5e2bd2006a0e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 27 Jul 2017 15:57:52 +0300 Subject: [PATCH] python.pkgs.pydns: use py3dns 3.1.1a for python3 --- pkgs/top-level/python-packages.nix | 41 +++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dab241f6e8a..73d35645ff0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22220,18 +22220,41 @@ in { doCheck = false; }; - pydns = buildPythonPackage rec { - name = "pydns-2.3.6"; - disabled = isPy3k; + pydns = + let + py3 = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "py3dns"; + version = "3.1.1a"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pydns/${name}.tar.gz"; - sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "0z0qmx9j1ivpgg54gqqmh42ljnzxaychc5inz2gbgv0vls765smz"; + }; - doCheck = false; + preConfigure = '' + sed -i \ + -e '/import DNS/d' \ + -e 's/DNS.__version__/"${version}"/g' \ + setup.py + ''; - }; + doCheck = false; + }; + + py2 = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pydns"; + version = "2.3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qnv7i9824nb5h9psj0rwzjyprwgfiwh5s5raa9avbqazy5hv5pi"; + }; + + doCheck = false; + }; + in if isPy3k then py3 else py2; pythondaemon = buildPythonPackage rec { name = "python-daemon-${version}";