diff options
| author | Leo Famulari <leo@famulari.name> | 2021-03-05 15:13:20 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-04-16 16:57:28 -0400 |
| commit | 76b6c61609fd8352ce01059307cf1aec85b8d0df (patch) | |
| tree | 4163fb96545d50309d42bb9e76e85461f0c4489f /gnu | |
| parent | dc6779486759936c6a26962a473d591e4fb10e77 (diff) | |
gnu: Python: Absorb grafted replacement.
* gnu/packages/python.scm (python-3.8)[source]: Add
'python-3.8-CVE-2021-3177.patch'.
[replacement]: Remove field.
(python-3.8/fixed): Remove variable.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/python.scm | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b8a31bcc6f1..ce424bdeb00 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm | |||
| @@ -365,7 +365,6 @@ data types.") | |||
| 365 | (define-public python-3.8 | 365 | (define-public python-3.8 |
| 366 | (package (inherit python-2) | 366 | (package (inherit python-2) |
| 367 | (name "python") | 367 | (name "python") |
| 368 | (replacement python-3.8/fixed) | ||
| 369 | (version "3.8.2") | 368 | (version "3.8.2") |
| 370 | (source (origin | 369 | (source (origin |
| 371 | (method url-fetch) | 370 | (method url-fetch) |
| @@ -373,6 +372,7 @@ data types.") | |||
| 373 | version "/Python-" version ".tar.xz")) | 372 | version "/Python-" version ".tar.xz")) |
| 374 | (patches (search-patches | 373 | (patches (search-patches |
| 375 | "python-CVE-2020-26116.patch" | 374 | "python-CVE-2020-26116.patch" |
| 375 | "python-3.8-CVE-2021-3177.patch" | ||
| 376 | "python-3-fix-tests.patch" | 376 | "python-3-fix-tests.patch" |
| 377 | "python-3.8-fix-tests.patch" | 377 | "python-3.8-fix-tests.patch" |
| 378 | "python-3-deterministic-build-info.patch" | 378 | "python-3-deterministic-build-info.patch" |
| @@ -523,14 +523,6 @@ data types.") | |||
| 523 | (version-major+minor version) | 523 | (version-major+minor version) |
| 524 | "/site-packages")))))))) | 524 | "/site-packages")))))))) |
| 525 | 525 | ||
| 526 | (define python-3.8/fixed | ||
| 527 | (package | ||
| 528 | (inherit python-3.8) | ||
| 529 | (source (origin | ||
| 530 | (inherit (package-source python-3.8)) | ||
| 531 | (patches (append (search-patches "python-3.8-CVE-2021-3177.patch") | ||
| 532 | (origin-patches (package-source python-3.8)))))))) | ||
| 533 | |||
| 534 | (define-public python-3.9 | 526 | (define-public python-3.9 |
| 535 | (package (inherit python-3.8) | 527 | (package (inherit python-3.8) |
| 536 | (name "python-next") | 528 | (name "python-next") |
