gnu: Python 2: Absorb grafted replacement.

* gnu/packages/python.scm (python-2.7)[source]: Add
'python-2.7-CVE-2021-3177.patch'.
[replacement]: Remove field.
(python-2.7/fixed): Remove variable.
This commit is contained in:
Leo Famulari 2021-03-05 15:15:01 -05:00
parent 0f7e1eed16
commit dc67794867
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08

View file

@ -107,7 +107,6 @@ (define-module (gnu packages python)
(define-public python-2.7
(package
(name "python2")
(replacement python-2.7/fixed)
(version "2.7.17")
(source
(origin
@ -122,7 +121,8 @@ (define-public python-2.7
"python-2.7-site-prefixes.patch"
"python-2.7-source-date-epoch.patch"
"python-2.7-adjust-tests.patch"
"python-cross-compile.patch"))
"python-cross-compile.patch"
"python-2.7-CVE-2021-3177.patch"))
(modules '((guix build utils)))
(snippet
'(begin
@ -351,14 +351,6 @@ (define-public python-2.7
(properties '((cpe-name . "python")))
(license license:psfl)))
(define python-2.7/fixed
(package
(inherit python-2.7)
(source (origin
(inherit (package-source python-2.7))
(patches (append (search-patches "python-2.7-CVE-2021-3177.patch")
(origin-patches (package-source python-2.7))))))))
;; Current 2.x version.
(define-public python-2 python-2.7)