nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Marius Bakke 2019-02-07 21:22:21 +01:00
parent 0293b353bd
commit 027250f1a6
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/python.scm
View File

@ -95,7 +95,6 @@
(package (package
(name "python2") (name "python2")
(version "2.7.15") (version "2.7.15")
(replacement python-2/fixed)
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -108,7 +107,9 @@
"python-2-deterministic-build-info.patch" "python-2-deterministic-build-info.patch"
"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"
"python2-CVE-2018-14647.patch"
"python2-CVE-2018-1000802.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; suboptimal to delete failing tests here, but if we delete them in the ;; 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 ;; arguments then we need to make sure to strip out that phase when it
@ -266,16 +267,6 @@ data types.")
;; Current 2.x version. ;; Current 2.x version.
(define-public python-2 python-2.7) (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 (define-public python2-called-python
;; Both 2.x and 3.x used to be called "python". In commit ;; Both 2.x and 3.x used to be called "python". In commit
;; a7714d42de2c3082f3609d1e63c83d703fb39cf9 (March 2018), we renamed the ;; a7714d42de2c3082f3609d1e63c83d703fb39cf9 (March 2018), we renamed the