From 76b6c61609fd8352ce01059307cf1aec85b8d0df Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 5 Mar 2021 15:13:20 -0500 Subject: 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 b8a31bcc6f..ce424bdeb0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -365,7 +365,6 @@ (define-public python2-called-python (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) @@ -373,6 +372,7 @@ (define-public python-3.8 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" @@ -523,14 +523,6 @@ (define-public python-3.8 (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") -- cgit v1.2.3