Merge branch 'master' into core-updates

This commit is contained in:
Ludovic Courtès 2019-06-13 13:24:35 +02:00
commit d9bbfe042e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
207 changed files with 7409 additions and 2775 deletions

View file

@ -57,6 +57,7 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages django)
#:use-module (gnu packages groff)
#:use-module (gnu packages libffi)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
@ -1541,6 +1542,19 @@ supports url redirection and retries, and also gzip and deflate decoding.")
(base32
"0sispclx263lybbk19zp1n9yhg8xxx4jddypzgi24vpjaqnsbwlc"))))
(build-system python-build-system)
(arguments
;; FIXME: The 'pypi' release does not contain tests.
'(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-reference-to-groff
(lambda _
(substitute* "awscli/help.py"
(("if not self._exists_on_path\\('groff'\\):") "")
(("raise ExecutableNotFoundError\\('groff'\\)") "")
(("cmdline = \\['groff'")
(string-append "cmdline = ['" (which "groff") "'")))
#t)))))
(propagated-inputs
`(("python-colorama" ,python-colorama)
("python-botocore" ,python-botocore)
@ -1548,9 +1562,8 @@ supports url redirection and retries, and also gzip and deflate decoding.")
("python-docutils" ,python-docutils)
("python-pyyaml" ,python-pyyaml)
("python-rsa" ,python-rsa)))
(arguments
;; FIXME: The 'pypi' release does not contain tests.
'(#:tests? #f))
(inputs
`(("groff" ,groff)))
(home-page "https://aws.amazon.com/cli/")
(synopsis "Command line client for AWS")
(description "AWS CLI provides a unified command line interface to the
@ -1647,13 +1660,13 @@ minimum of WSGI.")
(define-public python-flask
(package
(name "python-flask")
(version "1.0.2")
(version "1.0.3")
(source (origin
(method url-fetch)
(uri (pypi-uri "flask" version))
(uri (pypi-uri "Flask" version))
(sha256
(base32
"0j6f4a9rpfh25k1gp7azqhnni4mb4fgy50jammgjgddw1l3w0w92"))))
"1wxnhjlxwwjhjxmghykjhllpahv5pkdc5hln4ab6nab43s26sz5d"))))
(build-system python-build-system)
(arguments
'(#:phases