mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
gnu: Python: bump to version 2.7.4.
* gnu/packages/python.scm: bump to version 2.7.4, remove references to python-fix-dbm.patch. * Makefile.am: remove references to python-fix-dbm.patch * gnu/packages/patches/python-fix-dbm.patch: remove it.
This commit is contained in:
parent
e967678ed1
commit
0160536dcb
3 changed files with 3 additions and 27 deletions
|
@ -229,7 +229,6 @@ dist_patch_DATA = \
|
|||
gnu/packages/patches/make-impure-dirs.patch \
|
||||
gnu/packages/patches/mcron-install.patch \
|
||||
gnu/packages/patches/perl-no-sys-dirs.patch \
|
||||
gnu/packages/patches/python-fix-dbm.patch \
|
||||
gnu/packages/patches/procps-make-3.82.patch \
|
||||
gnu/packages/patches/qemu-multiple-smb-shares.patch \
|
||||
gnu/packages/patches/readline-link-ncurses.patch \
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
This patch allows the dbm module to be built using the compatibility mode of
|
||||
gdbm. It will not be needed any more with Python 2.7.4.
|
||||
--- setup.py 2013-04-06 00:53:37.000000000 +0200
|
||||
+++ setup.py.new 2013-04-06 19:55:05.000000000 +0200
|
||||
@@ -1158,10 +1158,14 @@
|
||||
for cand in dbm_order:
|
||||
if cand == "ndbm":
|
||||
if find_file("ndbm.h", inc_dirs, []) is not None:
|
||||
- # Some systems have -lndbm, others don't
|
||||
+ # Some systems have -lndbm, some have -lgdbm_compat,
|
||||
+ # others have no particular linker flags.
|
||||
if self.compiler.find_library_file(lib_dirs,
|
||||
'ndbm'):
|
||||
ndbm_libs = ['ndbm']
|
||||
+ elif self.compiler.find_library_file(lib_dirs,
|
||||
+ 'gdbm_compat'):
|
||||
+ ndbm_libs = ['gdbm_compat']
|
||||
else:
|
||||
ndbm_libs = []
|
||||
print "building dbm using ndbm"
|
|
@ -31,7 +31,7 @@ (define-module (gnu packages python)
|
|||
(define-public python
|
||||
(package
|
||||
(name "python")
|
||||
(version "2.7.3")
|
||||
(version "2.7.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -39,12 +39,10 @@ (define-public python
|
|||
version "/Python-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11f9aw855lrmknr6c82gm1ijr3n0smc6idyp94y7774yivjnplv1"))))
|
||||
"0bdn4dylm92n2dsvqvjfyask9jbz88aan5hi4lgkawkxs2v6wqmn"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; XXX: some tests fail
|
||||
#:patches (list (assoc-ref %build-inputs "patch-dbm"))
|
||||
#:patch-flags '("-p0")
|
||||
#:configure-flags
|
||||
(let ((bz2 (assoc-ref %build-inputs "bzip2"))
|
||||
(gdbm (assoc-ref %build-inputs "gdbm"))
|
||||
|
@ -68,8 +66,7 @@ (define-public python
|
|||
("gdbm" ,gdbm)
|
||||
("openssl" ,openssl)
|
||||
("readline" ,readline)
|
||||
("zlib" ,zlib)
|
||||
("patch-dbm" ,(search-patch "python-fix-dbm.patch"))))
|
||||
("zlib" ,zlib)))
|
||||
(home-page "http://python.org")
|
||||
(synopsis
|
||||
"Python, a high-level dynamically-typed programming language")
|
||||
|
|
Loading…
Reference in a new issue