diff options
| author | Leo Famulari <leo@famulari.name> | 2021-03-05 15:15:01 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-04-16 16:57:28 -0400 |
| commit | dc6779486759936c6a26962a473d591e4fb10e77 (patch) | |
| tree | 1196c46d722bc7a20e9274ab584cf0c79834be40 /gnu/packages/python.scm | |
| parent | 0f7e1eed16dbe56e5873a7fdfbda514f488867ff (diff) | |
gnu: Python 2: Absorb grafted replacement.
* gnu/packages/python.scm (python-2.7)[source]: Add
'python-2.7-CVE-2021-3177.patch'.
[replacement]: Remove field.
(python-2.7/fixed): Remove variable.
Diffstat (limited to 'gnu/packages/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5d8fa1185bc..b8a31bcc6f1 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 | ||
