gnu: python: Update to 3.6.4.
* gnu/packages/patches/python-3-search-paths.patch: Adjust context. * gnu/packages/python.scm (python): Update to 3.6.4. [source]: Re-enable test_socket.py.
This commit is contained in:
parent
4403030b7d
commit
5c798ca71d
@ -3,17 +3,14 @@ looking for headers and libraries.
|
|||||||
|
|
||||||
--- setup.py 2015-10-07 23:32:58.891329173 +0200
|
--- setup.py 2015-10-07 23:32:58.891329173 +0200
|
||||||
+++ setup.py 2015-10-07 23:46:29.653349924 +0200
|
+++ setup.py 2015-10-07 23:46:29.653349924 +0200
|
||||||
@@ -507,11 +507,8 @@ class PyBuildExt(build_ext):
|
@@ -575,8 +575,8 @@
|
||||||
# if a file is found in one of those directories, it can
|
# if a file is found in one of those directories, it can
|
||||||
# be assumed that no additional -I,-L directives are needed.
|
# be assumed that no additional -I,-L directives are needed.
|
||||||
if not cross_compiling:
|
if not cross_compiling:
|
||||||
- lib_dirs = self.compiler.library_dirs + [
|
- lib_dirs = self.compiler.library_dirs + system_lib_dirs
|
||||||
- '/lib64', '/usr/lib64',
|
- inc_dirs = self.compiler.include_dirs + system_include_dirs
|
||||||
- '/lib', '/usr/lib',
|
|
||||||
- ]
|
|
||||||
- inc_dirs = self.compiler.include_dirs + ['/usr/include']
|
|
||||||
+ lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep)
|
+ lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep)
|
||||||
+ inc_dirs = os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
|
+ inc_dirs = os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
|
||||||
else:
|
else:
|
||||||
lib_dirs = self.compiler.library_dirs[:]
|
# Add the sysroot paths. 'sysroot' is a compiler option used to
|
||||||
inc_dirs = self.compiler.include_dirs[:]
|
# set the logical path of the standard system headers and
|
||||||
|
@ -338,7 +338,7 @@ data types.")
|
|||||||
|
|
||||||
(define-public python-3.6
|
(define-public python-3.6
|
||||||
(package (inherit python-2)
|
(package (inherit python-2)
|
||||||
(version "3.6.3")
|
(version "3.6.4")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://www.python.org/ftp/python/"
|
(uri (string-append "https://www.python.org/ftp/python/"
|
||||||
@ -351,17 +351,13 @@ data types.")
|
|||||||
(patch-flags '("-p0"))
|
(patch-flags '("-p0"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1nl1raaagr4car787a2hmjv2dw6gqny53xfd6wisbgx4r5kxk9yd"))
|
"1fna7g8jxzl4kd2pqmmqhva5724c5m920x3fsrpsgskaylmr76qm"))
|
||||||
(snippet
|
(snippet
|
||||||
'(begin
|
'(begin
|
||||||
(for-each delete-file
|
(for-each delete-file
|
||||||
'("Lib/ctypes/test/test_structures.py" ; fails on aarch64
|
'("Lib/ctypes/test/test_structures.py" ; fails on aarch64
|
||||||
"Lib/ctypes/test/test_win32.py" ; fails on aarch64
|
"Lib/ctypes/test/test_win32.py" ; fails on aarch64
|
||||||
"Lib/test/test_fcntl.py" ; fails on aarch64
|
"Lib/test/test_fcntl.py")) ; fails on aarch64
|
||||||
;; This test fails on kernels older than 4.5.
|
|
||||||
;; It is skipped on these kernels in later
|
|
||||||
;; versions of Python.
|
|
||||||
"Lib/test/test_socket.py"))
|
|
||||||
#t))))
|
#t))))
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments python-2)
|
(substitute-keyword-arguments (package-arguments python-2)
|
||||||
|
Loading…
Reference in New Issue
Block a user