From 7a8a4fd7a73f81d99e293ae9f2c70357524beba1 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Tue, 8 Dec 2020 02:46:40 +0000
Subject: gnu: python-dnspython: Update to 2.0.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/python-xyz.scm (python-dnspython): Update to 2.0.0.
[source]: Download from pypi.
[native-inputs]: Add unzip.
[home-page]: Prefer https.
(python-dnspython-1.16):
(python2-dnspython-1.16): New variables.
* gnu/packages/ebook.scm (calibre):
* gnu/packages/web.scm (linkchecker): Use python2-dnspython-1.16.
* gnu/packages/finance.scm (electrum): Use python-dnspython-1.16.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/ebook.scm      |  2 +-
 gnu/packages/finance.scm    |  2 +-
 gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++--------
 gnu/packages/web.scm        |  2 +-
 4 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index f1e2bd49cb..e8dedf1cdd 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -151,7 +151,7 @@
        ("python2-css-parser" ,python2-css-parser)
        ("python2-dateutil" ,python2-dateutil)
        ("python2-dbus" ,python2-dbus)
-       ("python2-dnspython" ,python2-dnspython)
+       ("python2-dnspython" ,python2-dnspython-1.16)
        ("python2-dukpy" ,python2-dukpy)
        ("python2-feedparser" ,python2-feedparser)
        ("python2-html2text" ,python2-html2text)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 0ab033b796..6bd6827160 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -525,7 +525,7 @@ do so.")
        ("python-aiohttp-socks" ,python-aiohttp-socks)
        ("python-aiorpcx" ,python-aiorpcx)
        ("python-certifi" ,python-certifi)
-       ("python-dnspython" ,python-dnspython)
+       ("python-dnspython" ,python-dnspython-1.16)
        ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
     (arguments
      `(#:tests? #f                      ; no tests
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c650c582d5..53f4f83f14 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15,7 +15,7 @@
 ;;; Copyright © 2015, 2017 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2015, 2017 Kyle Meyer <kyle@kyleam.com>
+;;; Copyright © 2015, 2017, 2020 Kyle Meyer <kyle@kyleam.com>
 ;;; Copyright © 2015, 2016 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
 ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
@@ -13353,17 +13353,17 @@ until the object is actually required, and caches the result of said call.")
 (define-public python-dnspython
   (package
     (name "python-dnspython")
-    (version "1.16.0")
+    (version "2.0.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://www.dnspython.org/kits/"
-                                  version "/dnspython-" version ".tar.gz"))
+              (uri (pypi-uri "dnspython" version ".zip"))
               (sha256
                (base32
-                "1yaw7irazy42n0kdhlk7wyg8ki34rxcnc5xbc1wfwy245b0wbxab"))))
+                "1dyip5ygqqhrgcaiy7qzjpndl9xciip186paxqwkm726fj9z0jh4"))))
     (build-system python-build-system)
+    (native-inputs `(("unzip" ,unzip)))
     (arguments '(#:tests? #f))          ; XXX: requires internet access
-    (home-page "http://www.dnspython.org")
+    (home-page "https://www.dnspython.org")
     (synopsis "DNS toolkit for Python")
     (description
      "dnspython is a DNS toolkit for Python.  It supports almost all record
@@ -13371,8 +13371,21 @@ types.  It can be used for queries, zone transfers, and dynamic updates.
 It supports TSIG authenticated messages and EDNS0.")
     (license license:expat)))
 
-(define-public python2-dnspython
-  (package-with-python2 python-dnspython))
+(define-public python-dnspython-1.16
+  (package
+    (inherit python-dnspython)
+    (version "1.16.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.dnspython.org/kits/"
+                                  version "/dnspython-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1yaw7irazy42n0kdhlk7wyg8ki34rxcnc5xbc1wfwy245b0wbxab"))))
+    (native-inputs '())))
+
+(define-public python2-dnspython-1.16
+  (package-with-python2 python-dnspython-1.16))
 
 (define-public python-py3dns
   (package
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index f26b114d1a..55157443d1 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6431,7 +6431,7 @@ Instagram and YouTube.")
          "03ihjmc4bqxxqv71bb43r2f23sx0xnbq1k2fsg9fw05qa5s9x187"))))
     (build-system python-build-system)
     (inputs
-     `(("python2-dnspython" ,python2-dnspython)
+     `(("python2-dnspython" ,python2-dnspython-1.16)
        ("python2-pyxdg" ,python2-pyxdg)
        ("python2-requests" ,python2-requests)))
     (native-inputs
-- 
cgit v1.2.3