From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hartmut Goebel Subject: [PATCH 11/14] gnu: Remove needless inputs python-pip and python2-pip. Date: Wed, 28 Sep 2016 15:58:24 +0200 Message-ID: <1475071107-10765-12-git-send-email-h.goebel@crazy-compilers.com> References: <1475071107-10765-1-git-send-email-h.goebel@crazy-compilers.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpFON-0002eq-2d for guix-devel@gnu.org; Wed, 28 Sep 2016 09:59:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpFOK-0006eI-F1 for guix-devel@gnu.org; Wed, 28 Sep 2016 09:59:23 -0400 Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:43191) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpFOK-0006e4-9Y for guix-devel@gnu.org; Wed, 28 Sep 2016 09:59:20 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3skfT35Z5Wz3hkLg for ; Wed, 28 Sep 2016 15:59:19 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3skfT35FDMzvl3H for ; Wed, 28 Sep 2016 15:59:19 +0200 (CEST) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id U8qWW_w-8NRC for ; Wed, 28 Sep 2016 15:59:17 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-146-208.dynamic.mnet-online.de [188.174.146.208]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Wed, 28 Sep 2016 15:59:17 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 99BCA60B0C for ; Wed, 28 Sep 2016 15:58:28 +0200 (CEST) In-Reply-To: <1475071107-10765-1-git-send-email-h.goebel@crazy-compilers.com> 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" To: guix-devel@gnu.org This is installed together with Python 3 anyway and for our build of Python 2. * gnu/packages/python.scm (python-fixtures): remove input "python-pip". * gnu/packages/pdf.scm (python2-reportlab): remove native-input "python2-pip". (python-reportlab): remove now needless property "python2-variant". --- gnu/packages/pdf.scm | 8 ++------ gnu/packages/python.scm | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 61fe84e..614816f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -634,14 +634,10 @@ using a stylus.") (description "This is the ReportLab PDF Toolkit. It allows rapid creation of rich PDF documents, and also creation of charts in a variety of bitmap and vector formats.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-reportlab)))))) + (license license:bsd-3))) (define-public python2-reportlab - (package - (inherit (package-with-python2 - (strip-python2-variant python-reportlab))) - (native-inputs `(("python2-pip" ,python2-pip))))) + (package-with-python2 python-reportlab)) (define-public impressive (package diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 899573e..b30840a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1970,8 +1970,7 @@ and sensible default behaviors into your setuptools run.") `(("python-six" ,python-six) ("python-pbr-0.11" ,python-pbr-0.11))) (inputs - `(("python-pip" ,python-pip) - ;; Tests + `(;; Tests ("python-testtools" ,python-testtools))) (arguments '(#:tests? #f)) ; no setup.py test command -- 2.7.4