[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/18: gnu: Python: Absorb grafted replacement.
From: |
guix-commits |
Subject: |
04/18: gnu: Python: Absorb grafted replacement. |
Date: |
Fri, 12 Mar 2021 15:06:39 -0500 (EST) |
lfam pushed a commit to branch wip-next-release
in repository guix.
commit 93cdfb514d14396d315a4f288358eec1778d8d56
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Fri Mar 5 15:13:20 2021 -0500
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.
---
gnu/packages/python.scm | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e05c91b..95eae60 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -374,7 +374,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)
@@ -382,6 +381,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"
@@ -532,14 +532,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")
- branch wip-next-release created (now 0374a08), guix-commits, 2021/03/12
- 01/18: gnu: tzdata: Update to 2021a., guix-commits, 2021/03/12
- 02/18: gnu: postgresql: Absorb grafted replacement., guix-commits, 2021/03/12
- 03/18: gnu: OpenLDAP: Absorb grafted replacement., guix-commits, 2021/03/12
- 04/18: gnu: Python: Absorb grafted replacement.,
guix-commits <=
- 05/18: gnu: Python 2: Absorb grafted replacement., guix-commits, 2021/03/12
- 09/18: gnu: zziplib: Absorb grafted replacement., guix-commits, 2021/03/12
- 06/18: gnu: zstd: Absorb grafted replacement., guix-commits, 2021/03/12
- 10/18: gnu: cyrus-sasl: Absorb grafted replacement., guix-commits, 2021/03/12
- 15/18: gnu: libtiff: Absorb grafted replacement., guix-commits, 2021/03/12
- 14/18: gnu: gdk-pixbuf: Absorb grafted replacement., guix-commits, 2021/03/12
- 08/18: gnu: c-ares: Absorb grafted replacement., guix-commits, 2021/03/12
- 11/18: gnu: glib: Absorb grafted replacement., guix-commits, 2021/03/12
- 07/18: gnu: Remove QT 4., guix-commits, 2021/03/12
- 13/18: gnu: cairo: Absorb grafted replacement., guix-commits, 2021/03/12