From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: [PATCH] gnu: pypi importer: Remove python-setuptools and hint on how to re-add it. Date: Tue, 16 Aug 2016 20:13:10 +0200 Message-ID: <20160816181310.23954-1-dannym@scratchpost.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.9.1" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZirZ-0004ZM-RP for guix-devel@gnu.org; Tue, 16 Aug 2016 14:13:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bZirU-0000r6-Qe for guix-devel@gnu.org; Tue, 16 Aug 2016 14:13:21 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:43794) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZirU-0000qq-Ju for guix-devel@gnu.org; Tue, 16 Aug 2016 14:13:16 -0400 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 a multi-part message in MIME format. --------------2.9.1 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable gnu: pypi importer: Remove python-setuptools and hint on how to re-add it= . * guix/import/pypi.scm (make-pypi-sexp): Modified. --- guix/import/pypi.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --------------2.9.1 Content-Type: text/x-patch; name="0001-gnu-pypi-importer-Remove-python-setuptools-and-hint-.patch" Content-Disposition: attachment; filename="0001-gnu-pypi-importer-Remove-python-setuptools-and-hint-.patch" Content-Transfer-Encoding: quoted-printable diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 343445a..d177d33 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -233,7 +233,7 @@ name/variable pairs describing the required inputs of= this package." (sort (map (lambda (input) (list input (list 'unquote (string->symbol input)))) - (append '("python-setuptools") + (append ;'("python-setuptools") ;; Argparse has been part of Python since 2.7. (remove (cut string=3D? "python-argparse" <>) (guess-requirements source-url wheel-url tarbal= l)))) @@ -271,7 +271,8 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION= , and LICENSE." (home-page ,home-page) (synopsis ,synopsis) (description ,description) - (license ,(license->symbol license))))))) + (license ,(license->symbol license)) + (properties `((python2-variant . ,(delay python2-foobar))))= ))))) =20 (define (pypi->guix-package package-name) "Fetch the metadata for PACKAGE-NAME from pypi.python.org, and return = the --------------2.9.1--