summary refs log tree commit diff
path: root/gnu/local.mk
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-10-17 20:53:24 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-10-17 20:53:24 +0200
commit16f14f63db7a370d3917cf9c7d7e3735b0f59855 (patch)
tree367b77f69504cdb55109dcb68aa5a7bc3fe9693b /gnu/local.mk
parentd02bb02f7d833ad371c53c346b6cb77f01377cf4 (diff)
downloadguix-16f14f63db7a370d3917cf9c7d7e3735b0f59855.tar.gz
gnu: Python: Adjust grafts for core-updates merge.
This adjust the grafts from a55ebe2e3a7b438b4eec06c594440d3a0fb06a25 and
90aeaee861845142843a0f988fa4ff016c723cdb to apply to Python 2.7.15 and 3.7.0.

* gnu/packages/patches/python2-CVE-2018-1060.patch,
gnu/packages/patches/python2-CVE-2018-1061.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
* gnu/packages/python.scm (python-2/fixed): Remove patches that are already
present in 2.7.15.
(python-3/fixed): Remove obsolete phase.
Diffstat (limited to 'gnu/local.mk')
-rw-r--r--gnu/local.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 1181210da5..8d4d0d26ea 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1068,8 +1068,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/pygpgme-disable-problematic-tests.patch  \
   %D%/packages/patches/pyqt-configure.patch			\
   %D%/packages/patches/pyqt-public-sip.patch			\
-  %D%/packages/patches/python2-CVE-2018-1060.patch		\
-  %D%/packages/patches/python2-CVE-2018-1061.patch		\
   %D%/packages/patches/python2-CVE-2018-14647.patch		\
   %D%/packages/patches/python2-CVE-2018-1000802.patch		\
   %D%/packages/patches/python-2-deterministic-build-info.patch	\