gnu: python: Add sqlite input.
* gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch, gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch: New patches. * gnu-system.am (dist_patch_DATA): Add them. * gnu/packages/python.scm (python-2)[source]: Add patch. [inputs]: Add sqlite. (python)[source]: Add patch.master
parent
7639105b12
commit
b88e1b0a62
|
@ -417,6 +417,8 @@ dist_patch_DATA = \
|
||||||
gnu/packages/patches/pybugz-stty.patch \
|
gnu/packages/patches/pybugz-stty.patch \
|
||||||
gnu/packages/patches/python-fix-tests.patch \
|
gnu/packages/patches/python-fix-tests.patch \
|
||||||
gnu/packages/patches/python-libffi-mips-n32-fix.patch \
|
gnu/packages/patches/python-libffi-mips-n32-fix.patch \
|
||||||
|
gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch \
|
||||||
|
gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch \
|
||||||
gnu/packages/patches/qt4-tests.patch \
|
gnu/packages/patches/qt4-tests.patch \
|
||||||
gnu/packages/patches/ratpoison-shell.patch \
|
gnu/packages/patches/ratpoison-shell.patch \
|
||||||
gnu/packages/patches/readline-link-ncurses.patch \
|
gnu/packages/patches/readline-link-ncurses.patch \
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
From resolution of upstream python issue #20901: http://bugs.python.org/issue20901
|
||||||
|
|
||||||
|
diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py
|
||||||
|
--- Lib/sqlite3/test/hooks.py
|
||||||
|
+++ Lib/sqlite3/test/hooks.py
|
||||||
|
@@ -162,7 +162,7 @@ class ProgressTests(unittest.TestCase):
|
||||||
|
create table bar (a, b)
|
||||||
|
""")
|
||||||
|
second_count = len(progress_calls)
|
||||||
|
- self.assertGreater(first_count, second_count)
|
||||||
|
+ self.assertGreaterEqual(first_count, second_count)
|
||||||
|
|
||||||
|
def CheckCancelOperation(self):
|
||||||
|
"""
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
From resolution of upstream python issue #20901: http://bugs.python.org/issue20901
|
||||||
|
|
||||||
|
diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py
|
||||||
|
--- Lib/sqlite3/test/hooks.py
|
||||||
|
+++ Lib/sqlite3/test/hooks.py
|
||||||
|
@@ -162,7 +162,7 @@ class ProgressTests(unittest.TestCase):
|
||||||
|
create table bar (a, b)
|
||||||
|
""")
|
||||||
|
second_count = len(progress_calls)
|
||||||
|
- self.assertTrue(first_count > second_count)
|
||||||
|
+ self.assertGreaterEqual(first_count, second_count)
|
||||||
|
|
||||||
|
def CheckCancelOperation(self):
|
||||||
|
"""
|
||||||
|
|
|
@ -65,7 +65,8 @@
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://www.python.org/ftp/python/"
|
(uri (string-append "https://www.python.org/ftp/python/"
|
||||||
version "/Python-" version ".tar.xz"))
|
version "/Python-" version ".tar.xz"))
|
||||||
(patches (list (search-patch "python-libffi-mips-n32-fix.patch")))
|
(patches (list (search-patch "python-libffi-mips-n32-fix.patch")
|
||||||
|
(search-patch "python2-sqlite-3.8.4-test-fix.patch")))
|
||||||
(patch-flags '("-p0"))
|
(patch-flags '("-p0"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
|
@ -119,6 +120,7 @@
|
||||||
(let ((bz2 (assoc-ref %build-inputs "bzip2"))
|
(let ((bz2 (assoc-ref %build-inputs "bzip2"))
|
||||||
(gdbm (assoc-ref %build-inputs "gdbm"))
|
(gdbm (assoc-ref %build-inputs "gdbm"))
|
||||||
(libffi (assoc-ref %build-inputs "libffi"))
|
(libffi (assoc-ref %build-inputs "libffi"))
|
||||||
|
(sqlite (assoc-ref %build-inputs "sqlite"))
|
||||||
(openssl (assoc-ref %build-inputs "openssl"))
|
(openssl (assoc-ref %build-inputs "openssl"))
|
||||||
(readline (assoc-ref %build-inputs "readline"))
|
(readline (assoc-ref %build-inputs "readline"))
|
||||||
(zlib (assoc-ref %build-inputs "zlib")))
|
(zlib (assoc-ref %build-inputs "zlib")))
|
||||||
|
@ -127,6 +129,7 @@
|
||||||
(string-append "CPPFLAGS="
|
(string-append "CPPFLAGS="
|
||||||
"-I" bz2 "/include "
|
"-I" bz2 "/include "
|
||||||
"-I" gdbm "/include "
|
"-I" gdbm "/include "
|
||||||
|
"-I" sqlite "/include "
|
||||||
"-I" openssl "/include "
|
"-I" openssl "/include "
|
||||||
"-I" readline "/include "
|
"-I" readline "/include "
|
||||||
"-I" zlib "/include")
|
"-I" zlib "/include")
|
||||||
|
@ -134,6 +137,7 @@
|
||||||
"-L" bz2 "/lib "
|
"-L" bz2 "/lib "
|
||||||
"-L" gdbm "/lib "
|
"-L" gdbm "/lib "
|
||||||
"-L" libffi "/lib "
|
"-L" libffi "/lib "
|
||||||
|
"-L" sqlite "/lib "
|
||||||
"-L" openssl "/lib "
|
"-L" openssl "/lib "
|
||||||
"-L" readline "/lib "
|
"-L" readline "/lib "
|
||||||
"-L" zlib "/lib")))
|
"-L" zlib "/lib")))
|
||||||
|
@ -177,6 +181,7 @@
|
||||||
`(("bzip2" ,bzip2)
|
`(("bzip2" ,bzip2)
|
||||||
("gdbm" ,gdbm)
|
("gdbm" ,gdbm)
|
||||||
("libffi" ,libffi) ; for ctypes
|
("libffi" ,libffi) ; for ctypes
|
||||||
|
("sqlite" ,sqlite) ; for sqlite extension
|
||||||
("openssl" ,openssl)
|
("openssl" ,openssl)
|
||||||
("readline" ,readline)
|
("readline" ,readline)
|
||||||
("zlib" ,zlib)
|
("zlib" ,zlib)
|
||||||
|
@ -208,6 +213,7 @@ data types.")
|
||||||
(uri (string-append "https://www.python.org/ftp/python/"
|
(uri (string-append "https://www.python.org/ftp/python/"
|
||||||
version "/Python-" version ".tar.xz"))
|
version "/Python-" version ".tar.xz"))
|
||||||
(patches (list (search-patch "python-fix-tests.patch")
|
(patches (list (search-patch "python-fix-tests.patch")
|
||||||
|
(search-patch "python-sqlite-3.8.4-test-fix.patch")
|
||||||
(search-patch "python-libffi-mips-n32-fix.patch")))
|
(search-patch "python-libffi-mips-n32-fix.patch")))
|
||||||
(patch-flags '("-p0"))
|
(patch-flags '("-p0"))
|
||||||
(sha256
|
(sha256
|
||||||
|
|
Loading…
Reference in New Issue