From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 3/4] gnu: Don't use python-enum34 when building with python-3.4. Date: Sun, 14 Feb 2016 20:44:51 -0500 Message-ID: References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aV8EC-0007b4-Hu for guix-devel@gnu.org; Sun, 14 Feb 2016 20:45:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aV8E7-0007Ee-2f for guix-devel@gnu.org; Sun, 14 Feb 2016 20:45:27 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:51415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aV8E6-0007E8-Un for guix-devel@gnu.org; Sun, 14 Feb 2016 20:45:22 -0500 Received: from localhost.localdomain (c-73-233-160-251.hsd1.pa.comcast.net [73.233.160.251]) by mail.messagingengine.com (Postfix) with ESMTPA id 82095C00016 for ; Sun, 14 Feb 2016 20:45:19 -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 (python-parse-type)[inputs]: Remove python-enum34. (behave)[inputs]: Likewise. * gnu/packages/docker.scm (docker-compose)[inputs]: Likewise. --- gnu/packages/docker.scm | 1 - gnu/packages/python.scm | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 06b72ee..0760001 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -90,7 +90,6 @@ client.") `(("python-docker-py" ,python-docker-py) ("python-dockerpty" ,python-dockerpty) ("python-docopt" ,python-docopt) - ("python-enum34" ,python-enum34) ("python-jsonschema" ,python-jsonschema) ("python-pyyaml" ,python-pyyaml) ("python-requests" ,python-requests-2.7) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6e1c716..9296cdf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1354,8 +1354,7 @@ backported for previous versions of Python from 2.4 to 3.3.") (inputs `(("python-setuptools" ,python-setuptools) ("python-six" ,python-six) - ("python-parse" ,python-parse) - ("python-enum34" ,python-enum34))) ;required for python<3.4 + ("python-parse" ,python-parse))) (arguments '(#:tests? #f)) ;TODO: tests require pytest (home-page "https://github.com/jenisys/parse_type") (synopsis "Extended parse module") @@ -2005,7 +2004,6 @@ backported from Python 2.7 for Python 2.4+.") (inputs `(("python-setuptools" ,python-setuptools) ("python-six" ,python-six) - ("python-enum43" ,python-enum34) ("python-parse" ,python-parse) ("python-parse-type" ,python-parse-type))) (arguments `(#:tests? #f)) ;TODO: tests require nose>=1.3 and -- 2.6.3