Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2022-09-10 17:27:06 +02:00
commit 07140e8b10
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
21 changed files with 604 additions and 285 deletions

View file

@ -12465,14 +12465,14 @@ responses, rather than doing any computation.")
(define-public python-pip
(package
(name "python-pip")
(version "20.2.4")
(version "22.2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pip" version))
(sha256
(base32
"18b4qcijwivvkj1g0hs4w8zjbks0bjzdjcrqybnhmyx0gs2rmjc5"))))
"0jwac0bhfp48w4fqibf1ysrs2grksdv92hwqm7bmdw2jn2fr5l9z"))))
(build-system python-build-system)
(arguments
'(#:tests? #f)) ; there are no tests in the pypi archive.
@ -30784,3 +30784,9 @@ functions
@item Type annotations to help ensure correct usage
@end itemize")
(license license:bsd-3)))
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
;;; functionality or similar names.
;;;