From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 3/5] gnu: Split python2-pyicu into python-pyicu and python2-pyicu. Date: Thu, 3 Mar 2016 17:11:54 -0500 Message-ID: References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abbTa-0003JA-G3 for guix-devel@gnu.org; Thu, 03 Mar 2016 17:12:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abbTW-0002sV-M0 for guix-devel@gnu.org; Thu, 03 Mar 2016 17:12:06 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:42540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abbTW-0002sR-IU for guix-devel@gnu.org; Thu, 03 Mar 2016 17:12:02 -0500 Received: from jasmine.lan (c-69-249-5-231.hsd1.pa.comcast.net [69.249.5.231]) by mail.messagingengine.com (Postfix) with ESMTPA id 9EE226801F5 for ; Thu, 3 Mar 2016 17:12:01 -0500 (EST) In-Reply-To: In-Reply-To: References: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * gnu/packages/python.scm (python2-pyicu): Split variable into... (python-pyicu, python2-pyicu): ...both Python variants. (python-pyicu)[arguments]: Enable tests. --- gnu/packages/python.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f168d15..b168183 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1133,9 +1133,9 @@ Python 3.3+.") (package-with-python2 python-simplejson)) -(define-public python2-pyicu +(define-public python-pyicu (package - (name "python2-pyicu") + (name "python-pyicu") (version "1.9.2") (source (origin @@ -1148,15 +1148,18 @@ Python 3.3+.") (build-system python-build-system) (inputs `(("icu4c" ,icu4c))) - (arguments - `(#:python ,python-2 ; Python 3 works also, but needs special care for - ; linking with libpython3.3m - #:tests? #f)) ; no check target (home-page "http://pyicu.osafoundation.org/") (synopsis "Python extension wrapping the ICU C++ API") (description "PyICU is a python extension wrapping the ICU C++ API.") - (license x11))) + (license x11) + (properties `((python2-variant . ,(delay python2-pyicu)))))) + +(define-public python2-pyicu + (package + (inherit (package-with-python2 + (strip-python2-variant python-pyicu))) + (native-inputs `(("python2-setuptools" ,python2-setuptools))))) (define-public python2-dogtail ;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and -- 2.6.3