gnu: python-urllib3-next: Update to 2.3.0.

Keep urllib3@1.26.17 but under the dedicated variable name making it
less confusing with "-next" suffix which is meant to be higher version
of the current one.

* gnu/packages/python-web.scm (python-urllib3-next): Update to
2.3.0. Inherit from python-urllib3.
[native-inputs]: Add python-hatchling and python-hatch-vcs.
(python-urllib3-1.26): New variable.
(python-elasticsearch) [propagated-inputs]: Remove python-urllib3-next;
add python-urllib3-1.26.

* gnu/packages/android.scm (sdkmanager) [inputs]: Remove
python-urllib3-next; add python-urllib3-1.26.
* gnu/packages/package-management.scm (conan) [propagated-inputs]:
Likewise.
* gnu/packages/video.scm (yt-dlp) [inputs]: Likewise.

Change-Id: I2679dda98180815d4e3580d965b8db9c61e53f4a

4 files changed, 24 insertions, 29 deletions

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index bafca18abe..83df9bdfc9 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -740,7 +740,7 @@ file system.")
     (build-system pyproject-build-system)
     (inputs (list python-requests
                   python-argcomplete
-                  python-urllib3-next
+                  python-urllib3-1.26
                   gnupg))
     (native-inputs (list python-setuptools python-wheel))
     (arguments
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index faaeddfe5b..752e11a341 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1463,7 +1463,7 @@ tools_locations = {
            python-requests
            python-six
            python-tqdm
-           python-urllib3-next))
+           python-urllib3-1.26))
     (inputs
      (list coreutils))                  ;for printenv
     (native-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index dc541e8542..236cbed982 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5126,7 +5126,22 @@ supports url redirection and retries, and also gzip and deflate decoding.")
 
 (define-public python-urllib3-next
   (package
-    (name "python-urllib3")
+    (inherit python-urllib3)
+    (version "2.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "urllib3" version))
+       (sha256
+        (base32
+         "0k90y2bbmw87b9wx7lf0ps0wjpjbnk3h61byrrwid1ph7jdl9igq"))))
+    (native-inputs
+     (list python-hatchling
+           python-hatch-vcs))))
+
+(define-public python-urllib3-1.26
+  (package
+    (inherit python-urllib3)
     (version "1.26.17")
     (source
       (origin
@@ -5135,29 +5150,9 @@ supports url redirection and retries, and also gzip and deflate decoding.")
         (sha256
          (base32
           "08fzhaf77kbjj5abpl9xag6fpfxkdp1k5s7sqd3ayacdq91a5mi4"))))
-    (build-system python-build-system)
-    (arguments `(#:tests? #f))
-    (propagated-inputs
-     (append
-       ;; These 5 inputs are used to build urrlib3[secure]
-       (list python-certifi)
-       (if (member (%current-system)
-                   (package-transitive-supported-systems python-cryptography))
-         (list python-cryptography)
-         '())
-       (list python-idna)
-       (if (member (%current-system)
-                   (package-transitive-supported-systems python-pyopenssl))
-         (list python-pyopenssl)
-         '())
-       (list python-pysocks)))
-    (home-page "https://urllib3.readthedocs.io/")
-    (synopsis "HTTP library with thread-safe connection pooling")
-    (description
-     "Urllib3 supports features left out of urllib and urllib2 libraries.  It
-can reuse the same socket connection for multiple requests, it can POST files,
-supports url redirection and retries, and also gzip and deflate decoding.")
-    (license license:expat)))
+    (native-inputs
+     (list python-setuptools
+           python-wheel))))
 
 (define-public python-awscrt
   (package
@@ -6330,7 +6325,7 @@ CSS tidy.  Also supports URL rewriting in CSS files.")
            python-wheel))
     (propagated-inputs
      (list python-certifi
-           python-urllib3-next))
+           python-urllib3-1.26))
     (home-page "https://github.com/elastic/elasticsearch-py")
     (synopsis "Low-level client for Elasticsearch")
     (description "Official low-level client for Elasticsearch.  Its goal is to
@@ -6858,7 +6853,7 @@ for URL parsing and changing.")
     (propagated-inputs (list python-arrow python-pytz python-requests))
     (native-inputs (list python-requests-mock
                          python-setuptools
-                         python-urllib3-next
+                         python-urllib3-1.26
                          python-wheel))
     (home-page "https://github.com/ucfopen/canvasapi")
     (synopsis "API wrapper for the Canvas LMS")
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index af6ef3bd32..36981f3c0e 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3221,7 +3221,7 @@ YouTube.com and many more sites.")
                   python-mutagen
                   python-pycryptodomex
                   python-requests-next ; TODO Remove this special package
-                  python-urllib3-next  ; TODO Remove this one too
+                  python-urllib3-1.26  ; TODO Remove this one too
                   python-websockets))
     (native-inputs
      (append