rekahsoft-gnu: Update awscliv2 to 2.7.18

* rekahsoft-gnu/packages/python-xyz.scm (python-prompt-toolkit-3.0.28): New variable, replacing old variable for python-prompt-toolkit-2
(awscliv2): bump awscliv2 version, adjust native-dependencies to use newly packaged python-prompt-toolkit@3.0.28 (as guix upstream has a newer, but incompatible version packaged)
This commit is contained in:
Collin J. Doering 2022-07-24 12:39:33 -04:00
parent 4dcfd8731e
commit f7db8d53d7
Signed by: rekahsoft
GPG Key ID: 7B4DEB93212B3022
1 changed files with 9 additions and 10 deletions

View File

@ -241,26 +241,25 @@ bindings for Python 3.")
(license license:bsd-3)))
;; python-prompt-toolkit-2 was removed upstream from guix's channel; added here as awscliv2 depends on it
(define-public python-prompt-toolkit-2
(package (inherit python-prompt-toolkit)
;; awscliv2 depends on 'prompt-toolkit<3.0.29,>=3.0.24', however upstream 3.0.29 is packaged
(define-public python-prompt-toolkit-3.0.28
(package/inherit python-prompt-toolkit
(name "python-prompt-toolkit")
(version "2.0.7")
(version "3.0.28")
(source
(origin
(method url-fetch)
(uri (pypi-uri "prompt_toolkit" version))
(sha256
(base32
"0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx"))))
(propagated-inputs
(list python-wcwidth python-six python-pygments))
(properties '())))
"0l0nnm9fvs8lklk2qq8mylb9jrlxvlqzpmqr4n7rdhl63rmx274z"))))))
(define-public awscliv2
(package
(inherit awscli)
(name "awscliv2")
(version "2.4.7")
(version "2.7.18")
(source
(origin
(method git-fetch)
@ -269,13 +268,13 @@ bindings for Python 3.")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1b7f8vwd90wpbzb7i4a4mdficzqaa41jfa2k6mm3i4cas48fklkk"))))
(base32 "10p6433spz3lw5jwnw0kflp3fh629chiscp868slld6x2kp80gi4"))))
(native-inputs
`(("python-distro" ,python-distro-1.5)
("python-docutils" ,python-docutils-0.15)
("python-s3transfer" ,python-s3transfer)
("python-awscrt" ,python-awscrt)
("python-prompt-toolkit" ,python-prompt-toolkit-2)
("python-prompt-toolkit" ,python-prompt-toolkit-3.0.28)
("python-ruamel.yaml" ,python-ruamel.yaml-0.15)
("python-cryptography" ,python-cryptography-3.3.2)
("python-botocore" ,python-botocore-2.0.0dev155)))