rekahsoft-gnu: python-xyz: Fix propagated input collisions for awscliv2

- Remove python-cryptography@3.3.2 for awscliv2 and instead use upstream guix
  package

rekahsoft-gnu/packages/python-xyz.scm

@@ -237,8 +237,8 @@ bindings for Python 3.")
        ("python-awscrt" ,python-awscrt-0.11-awscliv2)
        ("python-prompt-toolkit" ,python-prompt-toolkit-2)
        ("python-ruamel.yaml" ,python-ruamel.yaml)
-       ("python-s3transfer" ,python-s3transfer-0.4)
-       ("python-cryptography" ,python-cryptography-3.3.2)
+       ("python-s3transfer" ,python-s3transfer-0.4-awscliv2)
+       ("python-cryptography" ,python-cryptography)
        ("python-docutils" ,python-docutils-0.15)
        ("python-colorama" ,python-colorama-0.4.3)
        ("python-botocore" ,python-botocore-2.0.0dev145)))
@@ -282,18 +282,6 @@ bindings for Python 3.")
     (description "AWS CLI v2 provides a unified command line interface to the
 Amazon Web Services (AWS) API.")))
 
-(define-public python-cryptography-3.3.2
-  (package
-    (inherit python-cryptography)
-    (version "3.3.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "cryptography" version))
-       (sha256
-        (base32
-         "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s"))))))
-
 (define-public python-awscrt
   (package
     (name "python-awscrt")
@@ -367,6 +355,16 @@ Amazon Web Services (AWS) API.")))
                (base32
                 "1cp169vz9rvng7dwbn33fgdbl3b014zpsdqsnfxxw7jm2r5jy0nb"))))))
 
+(define-public python-s3transfer-0.4-awscliv2
+  (package
+    (inherit python-s3transfer-0.4)
+    (version "0.4.2-awscliv2")
+    (propagated-inputs
+     `(,@(alist-delete "python-botocore"
+                       (package-propagated-inputs python-s3transfer-0.4))
+       ("python-botocore" ,python-botocore-2.0.0dev145)
+       ("python-awscrt" ,python-awscrt-0.11-awscliv2)))))
+
 (define-public python-docutils-0.15
   (package
     (inherit python-docutils)