lfam pushed a commit to branch wip-next-release in repository guix. commit 5cebf32a00fc4f24afce847009940881ba553fd3 Author: Leo Famulari <l...@famulari.name> AuthorDate: Fri Mar 5 15:13:20 2021 -0500
gnu: Python: Absorb grafted replacement. * gnu/packages/python.scm (python-3.8)[source]: Add 'python-3.8-CVE-2021-3177.patch'. [replacement]: Remove field. (python-3.8/fixed): Remove variable. --- gnu/packages/python.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e05c91b..95eae60 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -374,7 +374,6 @@ data types.") (define-public python-3.8 (package (inherit python-2) (name "python") - (replacement python-3.8/fixed) (version "3.8.2") (source (origin (method url-fetch) @@ -382,6 +381,7 @@ data types.") version "/Python-" version ".tar.xz")) (patches (search-patches "python-CVE-2020-26116.patch" + "python-3.8-CVE-2021-3177.patch" "python-3-fix-tests.patch" "python-3.8-fix-tests.patch" "python-3-deterministic-build-info.patch" @@ -532,14 +532,6 @@ data types.") (version-major+minor version) "/site-packages")))))))) -(define python-3.8/fixed - (package - (inherit python-3.8) - (source (origin - (inherit (package-source python-3.8)) - (patches (append (search-patches "python-3.8-CVE-2021-3177.patch") - (origin-patches (package-source python-3.8)))))))) - (define-public python-3.9 (package (inherit python-3.8) (name "python-next")