From mboxrd@z Thu Jan 1 00:00:00 1970 From: swedebugia@riseup.net Subject: Re: Trying to fix an error in the pypi-importer Date: Sat, 02 Jan 2016 18:10:25 +0100 Message-ID: <257e9ac376ee2c97785c0e63715ed38c@riseup.net> References: <568453F6.1050605@gmail.com> <2c5756c8877a36699f8dbb07731ab3c1@riseup.net> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aFPhJ-0001lY-An for guix-devel@gnu.org; Sat, 02 Jan 2016 12:10:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aFPhI-0000Lh-9w for guix-devel@gnu.org; Sat, 02 Jan 2016 12:10:33 -0500 In-Reply-To: <2c5756c8877a36699f8dbb07731ab3c1@riseup.net> 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 Cc: guix-devel-bounces+swedebugia=riseup.net@gnu.org On 2016-01-01 19:10, swedebugia@riseup.net wrote: > On 2015-12-30 23:00, Cyril Roelandt wrote: >> On 12/30/2015 08:53 PM, swedebugia@riseup.net wrote: >>> I am trying to fix this error in the pypi-importer: >> >> Could you send your fix as a unified diff? If you work from the git >> repo, you can just run "git diff" to produce one. > > diff --git a/guix/build-system/python.scm > b/guix/build-system/python.scm > index 2532210..f9b88d2 100644 > --- a/guix/build-system/python.scm > +++ b/guix/build-system/python.scm > @@ -41,13 +41,18 @@ > ;; > ;; Code: > > -(define (pypi-uri name version) > +(define (pypi-uri name version ending) > "Return a URI string for the Python package hosted on the Python > Package > -Index (PyPI) corresponding to NAME and VERSION." > - (string-append "https://pypi.python.org/packages/source/" > +Index (PyPI) corresponding to NAME, VERSION and optionally ENDING." > + (if (zero? ending) > + (string-append "https://pypi.python.org/packages/source/" > (string-take name 1) "/" name "/" > - name "-" version ".tar.gz")) > - > + name "-" version ".tar.gz") > + ;else > + (string-append "https://pypi.python.org/packages/source/" > + (string-take name 1) "/" name "/" > + name "-" version "." ending )) > + > (define %python-build-system-modules > ;; Build-side modules imported by default. > `((guix build python-build-system) During compilation after applying my patch above I get this error. GUILEC guix/build-system/python.go ice-9/boot-9.scm:106:20: In procedure #: ice-9/boot-9.scm:106:20: In procedure scm_i_lreadparen: guix/build-system/python.scm:216:1: end of file Makefile:4604: recipe for target 'guix/build-system/python.go' failed So removing the (else -> to a comment and adjusting the parentheses did not work. Could somebody point me to relevant documentation about how to write conditional statements in guile?