diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-04-30 18:21:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-30 18:21:31 +0200 |
| commit | 5866fa558b68b3e0213b9eef93d115e6e38dcc2a (patch) | |
| tree | b39873aae544ad920caaefa8a98f7f5deb5f0a8e /gnu/packages/python.scm | |
| parent | ed9d890e0e24b10df6f170fe7c9635151e0423c1 (diff) | |
| parent | 2c11e7be745a790320a42a357635997310d731d0 (diff) | |
Merge branch 'wip-ungrafting'
Diffstat (limited to 'gnu/packages/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5d8fa1185b..ce424bdeb0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -107,7 +107,6 @@ (define-public python-2.7 (package (name "python2") - (replacement python-2.7/fixed) (version "2.7.17") (source (origin @@ -122,7 +121,8 @@ "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 @@ data types.") (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) @@ -373,7 +365,6 @@ data types.") (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) @@ -381,6 +372,7 @@ data types.") 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" @@ -531,14 +523,6 @@ data types.") (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") |