diff options
author | Mark H Weaver <mhw@netris.org> | 2015-06-14 08:49:42 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-06-14 08:49:42 -0400 |
commit | bcf2971f6ebc965aa94391b2a8d39e5005885806 (patch) | |
tree | c12187a787b934fb79d159046a4a5516e5d39f97 /gnu/packages/python.scm | |
parent | ec2990716005b4b41bab6b707ada0206c1655be8 (diff) | |
parent | 7871724df7218428fac53133496c474bac8c5ea8 (diff) |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/commencement.scm
gnu/packages/xml.scm
Diffstat (limited to 'gnu/packages/python.scm')
-rw-r--r-- | gnu/packages/python.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 914c2dc23c..232a785778 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -207,7 +207,9 @@ data types.") (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) - (patches (list (search-patch "python-fix-tests.patch"))) + (patches (list (search-patch "python-fix-tests.patch") + ;; XXX Try removing this patch for python > 3.4.3 + (search-patch "python-disable-ssl-test.patch"))) (patch-flags '("-p0")) (sha256 (base32 |