From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyril Roelandt Subject: [PATCH] gnu: Python: bump to version 2.7.4. Date: Mon, 15 Apr 2013 22:39:26 +0200 Message-ID: <1366058366-21214-1-git-send-email-tipecaml@gmail.com> References: <1365343909-17627-1-git-send-email-tipecaml@gmail.com> Return-path: Received: from eggs.gnu.org ([208.118.235.92]:45917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URqM2-000402-Ib for bug-guix@gnu.org; Mon, 15 Apr 2013 16:50:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URqM0-0006B2-WF for bug-guix@gnu.org; Mon, 15 Apr 2013 16:50:22 -0400 Received: from mail-wi0-x236.google.com ([2a00:1450:400c:c05::236]:51556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URqM0-0006As-Q0 for bug-guix@gnu.org; Mon, 15 Apr 2013 16:50:20 -0400 Received: by mail-wi0-f182.google.com with SMTP id m6so939834wiv.3 for ; Mon, 15 Apr 2013 13:50:19 -0700 (PDT) In-Reply-To: <1365343909-17627-1-git-send-email-tipecaml@gmail.com> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org To: bug-guix@gnu.org * 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. --- On 04/07/2013 04:11 PM, Cyril Roelandt wrote: > This has been fixed upstream, and will be available in Python 2.7.4. Well, Python 2.7.4 is out. Cyril. Makefile.am | 1 - gnu/packages/patches/python-fix-dbm.patch | 20 -------------------- gnu/packages/python.scm | 9 +++------ 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 gnu/packages/patches/python-fix-dbm.patch diff --git a/Makefile.am b/Makefile.am index 930ea6c..df0a513 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ diff --git a/gnu/packages/patches/python-fix-dbm.patch b/gnu/packages/patches/python-fix-dbm.patch deleted file mode 100644 index 29e4521..0000000 --- a/gnu/packages/patches/python-fix-dbm.patch +++ /dev/null @@ -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" diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3f94164..8b45159 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -31,7 +31,7 @@ (define-public python (package (name "python") - (version "2.7.3") + (version "2.7.4") (source (origin (method url-fetch) @@ -39,12 +39,10 @@ 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 @@ ("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") -- 1.7.10.4