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:
parent
0f7e1eed16
commit
dc67794867
1 changed files with 2 additions and 10 deletions
|
@ -107,7 +107,6 @@
|
||||||
(define-public python-2.7
|
(define-public python-2.7
|
||||||
(package
|
(package
|
||||||
(name "python2")
|
(name "python2")
|
||||||
(replacement python-2.7/fixed)
|
|
||||||
(version "2.7.17")
|
(version "2.7.17")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
|
@ -122,7 +121,8 @@
|
||||||
"python-2.7-site-prefixes.patch"
|
"python-2.7-site-prefixes.patch"
|
||||||
"python-2.7-source-date-epoch.patch"
|
"python-2.7-source-date-epoch.patch"
|
||||||
"python-2.7-adjust-tests.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)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
'(begin
|
'(begin
|
||||||
|
@ -351,14 +351,6 @@ data types.")
|
||||||
(properties '((cpe-name . "python")))
|
(properties '((cpe-name . "python")))
|
||||||
(license license:psfl)))
|
(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.
|
;; Current 2.x version.
|
||||||
(define-public python-2 python-2.7)
|
(define-public python-2 python-2.7)
|
||||||
|
|
||||||
|
|
Reference in a new issue