diff --git a/rekahsoft-gnu/packages/python-xyz.scm b/rekahsoft-gnu/packages/python-xyz.scm index 199729e..31f7612 100644 --- a/rekahsoft-gnu/packages/python-xyz.scm +++ b/rekahsoft-gnu/packages/python-xyz.scm @@ -2229,14 +2229,13 @@ and have a maximum lifetime built-in.") (propagated-inputs `(,@(fold alist-delete (package-propagated-inputs awscli) - '("python-rsa" "python-s3transfer" "python-colorama" + '("python-s3transfer" "python-colorama" "python-botocore" "python-docutils")) - ("python-rsa" ,python-rsa-3.1) - ("python-awscrt" ,python-awscrt-0.11) + ("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) + ("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.0dev141))) @@ -2249,22 +2248,6 @@ and have a maximum lifetime built-in.") (description "AWS CLI v2 provides a unified command line interface to the Amazon Web Services (AWS) API."))) -(define-public python-rsa-3.1 - (package - (inherit python-rsa) - (version "3.1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "rsa" version)) - (sha256 - (base32 - "0n2zwd0r1686gvlj800x2ras3r7jdiay384yczbr56yyl598gsv6")))) - (arguments - `(,@(package-arguments python-rsa) - ;; TODO: fixme - #:tests? #f)))) - (define-public python-awscrt (package (name "python-awscrt") @@ -2301,6 +2284,20 @@ Amazon Web Services (AWS) API."))) (base32 "1zv2043mxzmbb449n3rwirz1zl22npsyyw05ps2h1gq4ljy6iamq")))))) +(define-public python-awscrt-0.11-awscliv2 + (package + (inherit python-awscrt-0.11) + ;; FIXME: there are depedency conflicts that require not propigating the + ;; correct version so that awscliv2 can be installed. + (native-inputs + `(,@(package-native-inputs python-awscrt-0.11) + ("python-boto3" ,python-boto3) + ("python-s3transfer" ,python-s3transfer))) + (propagated-inputs + `(,@(fold alist-delete + (package-propagated-inputs python-awscrt-0.11) + '("python-boto3" "python-s3transfer")))))) + (define-public python-distro-1.5 (package (inherit python-distro) @@ -2335,17 +2332,12 @@ Amazon Web Services (AWS) API."))) (base32 "1cp169vz9rvng7dwbn33fgdbl3b014zpsdqsnfxxw7jm2r5jy0nb")))))) -(define-public python-cryptography-3.3 +(define-public python-s3transfer-0.4-awscliv2 (package - (inherit python-cryptography) - (version "3.3.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "cryptography" version)) - (sha256 - (base32 - "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s")))))) + (inherit python-s3transfer-0.4) + (propagated-inputs + `(,@(alist-delete "python-botocore" (package-propagated-inputs python-s3transfer-0.4)) + ("python-botocore" ,python-botocore-2.0.0dev141))))) (define-public python-docutils-0.15 (package @@ -2359,7 +2351,7 @@ Amazon Web Services (AWS) API."))) (base32 "168s5v7bff5ar9jspr6wn823q1sbn0jhnbp9clk41nl8j09fmbm2")))) (arguments - `(,@(package-arguments python-rsa) + `(,@(package-arguments python-docutils) ;; TODO: fixme #:tests? #f))))