From: Cyril Roelandt <tipecaml@gmail.com>
To: bug-guix@gnu.org
Subject: [PATCH] gnu: Python: bump to version 2.7.4.
Date: Mon, 15 Apr 2013 22:39:26 +0200 [thread overview]
Message-ID: <1366058366-21214-1-git-send-email-tipecaml@gmail.com> (raw)
In-Reply-To: <1365343909-17627-1-git-send-email-tipecaml@gmail.com>
* 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
next prev parent reply other threads:[~2013-04-15 20:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-02 14:32 Python: Zlib support Nikita Karetnikov
2013-04-02 18:25 ` Cyril Roelandt
2013-04-03 4:00 ` Nikita Karetnikov
2013-04-03 8:35 ` Ludovic Courtès
2013-04-03 21:33 ` [PATCH] gnu: Fix zlib support in Python Cyril Roelandt
2013-04-04 8:12 ` Nikita Karetnikov
2013-04-05 22:45 ` [PATCH] gnu: Python: fix the compilation of some modules from the standard library Cyril Roelandt
2013-04-06 14:09 ` Ludovic Courtès
2013-04-06 18:48 ` [PATCH] gnu: Python: enable the dbm module Cyril Roelandt
2013-04-06 22:39 ` Ludovic Courtès
2013-04-07 14:11 ` [PATCH] gnu: Python: fix the compilation of some modules from the standard library Cyril Roelandt
2013-04-07 14:29 ` Ludovic Courtès
2013-04-15 20:39 ` Cyril Roelandt [this message]
2013-04-15 21:47 ` [PATCH] gnu: Python: bump to version 2.7.4 Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366058366-21214-1-git-send-email-tipecaml@gmail.com \
--to=tipecaml@gmail.com \
--cc=bug-guix@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.