mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: python2: Incorporate grafted changes.
* gnu/packages/python.scm (python-2.7)[source](patches): Add python2-CVE-2018-14647.patch and python2-CVE-2018-1000802.patch. [replacement]: Remove field. (python-2/fixed): Remove variable.
This commit is contained in:
parent
0293b353bd
commit
027250f1a6
1 changed files with 3 additions and 12 deletions
|
@ -95,7 +95,6 @@ (define-public python-2.7
|
|||
(package
|
||||
(name "python2")
|
||||
(version "2.7.15")
|
||||
(replacement python-2/fixed)
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -108,7 +107,9 @@ (define-public python-2.7
|
|||
"python-2-deterministic-build-info.patch"
|
||||
"python-2.7-site-prefixes.patch"
|
||||
"python-2.7-source-date-epoch.patch"
|
||||
"python-2.7-adjust-tests.patch"))
|
||||
"python-2.7-adjust-tests.patch"
|
||||
"python2-CVE-2018-14647.patch"
|
||||
"python2-CVE-2018-1000802.patch"))
|
||||
(modules '((guix build utils)))
|
||||
;; suboptimal to delete failing tests here, but if we delete them in the
|
||||
;; arguments then we need to make sure to strip out that phase when it
|
||||
|
@ -266,16 +267,6 @@ (define-public python-2.7
|
|||
;; Current 2.x version.
|
||||
(define-public python-2 python-2.7)
|
||||
|
||||
(define python-2/fixed
|
||||
(package
|
||||
(inherit python-2)
|
||||
(source (origin
|
||||
(inherit (package-source python-2))
|
||||
(patches (append
|
||||
(origin-patches (package-source python-2))
|
||||
(search-patches "python2-CVE-2018-14647.patch"
|
||||
"python2-CVE-2018-1000802.patch")))))))
|
||||
|
||||
(define-public python2-called-python
|
||||
;; Both 2.x and 3.x used to be called "python". In commit
|
||||
;; a7714d42de2c3082f3609d1e63c83d703fb39cf9 (March 2018), we renamed the
|
||||
|
|
Loading…
Reference in a new issue