summaryrefslogtreecommitdiff
path: root/gnu/packages/python.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/python.scm')
-rw-r--r--gnu/packages/python.scm22
1 files changed, 3 insertions, 19 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 5d8fa1185bc..ce424bdeb00 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -107,7 +107,6 @@
107(define-public python-2.7 107(define-public python-2.7
108 (package 108 (package
109 (name "python2") 109 (name "python2")
110 (replacement python-2.7/fixed)
111 (version "2.7.17") 110 (version "2.7.17")
112 (source 111 (source
113 (origin 112 (origin
@@ -122,7 +121,8 @@
122 "python-2.7-site-prefixes.patch" 121 "python-2.7-site-prefixes.patch"
123 "python-2.7-source-date-epoch.patch" 122 "python-2.7-source-date-epoch.patch"
124 "python-2.7-adjust-tests.patch" 123 "python-2.7-adjust-tests.patch"
125 "python-cross-compile.patch")) 124 "python-cross-compile.patch"
125 "python-2.7-CVE-2021-3177.patch"))
126 (modules '((guix build utils))) 126 (modules '((guix build utils)))
127 (snippet 127 (snippet
128 '(begin 128 '(begin
@@ -351,14 +351,6 @@ data types.")
351 (properties '((cpe-name . "python"))) 351 (properties '((cpe-name . "python")))
352 (license license:psfl))) 352 (license license:psfl)))
353 353
354(define python-2.7/fixed
355 (package
356 (inherit python-2.7)
357 (source (origin
358 (inherit (package-source python-2.7))
359 (patches (append (search-patches "python-2.7-CVE-2021-3177.patch")
360 (origin-patches (package-source python-2.7))))))))
361
362;; Current 2.x version. 354;; Current 2.x version.
363(define-public python-2 python-2.7) 355(define-public python-2 python-2.7)
364 356
@@ -373,7 +365,6 @@ data types.")
373(define-public python-3.8 365(define-public python-3.8
374 (package (inherit python-2) 366 (package (inherit python-2)
375 (name "python") 367 (name "python")
376 (replacement python-3.8/fixed)
377 (version "3.8.2") 368 (version "3.8.2")
378 (source (origin 369 (source (origin
379 (method url-fetch) 370 (method url-fetch)
@@ -381,6 +372,7 @@ data types.")
381 version "/Python-" version ".tar.xz")) 372 version "/Python-" version ".tar.xz"))
382 (patches (search-patches 373 (patches (search-patches
383 "python-CVE-2020-26116.patch" 374 "python-CVE-2020-26116.patch"
375 "python-3.8-CVE-2021-3177.patch"
384 "python-3-fix-tests.patch" 376 "python-3-fix-tests.patch"
385 "python-3.8-fix-tests.patch" 377 "python-3.8-fix-tests.patch"
386 "python-3-deterministic-build-info.patch" 378 "python-3-deterministic-build-info.patch"
@@ -531,14 +523,6 @@ data types.")
531 (version-major+minor version) 523 (version-major+minor version)
532 "/site-packages")))))))) 524 "/site-packages"))))))))
533 525
534(define python-3.8/fixed
535 (package
536 (inherit python-3.8)
537 (source (origin
538 (inherit (package-source python-3.8))
539 (patches (append (search-patches "python-3.8-CVE-2021-3177.patch")
540 (origin-patches (package-source python-3.8))))))))
541
542(define-public python-3.9 526(define-public python-3.9
543 (package (inherit python-3.8) 527 (package (inherit python-3.8)
544 (name "python-next") 528 (name "python-next")