From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nils Gillmann Subject: Re: [PATCH] gnu: add lispf4 Date: Mon, 08 Feb 2016 12:17:51 +0100 Message-ID: <877fifxxgg.fsf@grrlz.net> References: <87y4ax3cf2.fsf@grrlz.net> <87wpqgea7v.fsf@grrlz.net> <20160208003608.GA6080@jasmine> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSjpP-0004zN-NE for guix-devel@gnu.org; Mon, 08 Feb 2016 06:18:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSjpM-0001pu-Ch for guix-devel@gnu.org; Mon, 08 Feb 2016 06:17:59 -0500 Received: from latitanza.investici.org ([2001:888:2000:56::19]:61673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSjpL-0001oG-OW for guix-devel@gnu.org; Mon, 08 Feb 2016 06:17:56 -0500 In-Reply-To: <20160208003608.GA6080@jasmine> (Leo Famulari's message of "Sun, 7 Feb 2016 19:36:08 -0500") 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: Leo Famulari Cc: guix-devel@gnu.org Leo Famulari writes: > On Sun, Feb 07, 2016 at 05:50:12PM +0100, Nils Gillmann wrote: >> Nils Gillmann writes: >> >> --snipsnap-- >> >> I hope this works, I pulled from master some minutes ago, I merged the >> branch, squashed the commits into one with softreset,... >> I really hope I did it right. It takes some time getting used to more >> git usage. >> > > It worked :) > >> From d3dfc39a537b07e01370ed631c7771952948a9c2 Mon Sep 17 00:00:00 2001 >> From: Nils Gillmann >> Date: Sun, 7 Feb 2016 17:36:25 +0100 >> Subject: [PATCH] gnu: Add lispf4. >> >> * gnu/packages/lisp.scm (lispf4): New variable. > <-----| > This can be at the first column. > >> + #:phases >> + (modify-phases %standard-phases >> + (delete 'configure) >> + (replace >> + 'install >> + (lambda* (#:key outputs inputs #:allow-other-keys) >> + (let* ((out (assoc-ref outputs "out")) >> + (bin (string-append out "/bin"))) >> + (install-file "lispf4" bin) >> + (install-file "SYSATOMS" bin) >> + (install-file "BASIC.IMG" bin) >> + (let* ((doc (assoc-ref outputs "doc")) >> + (doc (string-append doc "/share/doc/lispf4"))) > > How about defining 'doc' in one go in the same block as 'out' and 'bin', > as in the attached diff? I can push with that change if appropriate. If > it's not appropriate, then I can push that as well, fixing the > indentation in the changelog :) The diff looks okay for me, I only ended up with 2 (let*) because of the package I took as an example. Works for me, and if you have no further corrections I should do, it's done on my side. > > diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm > index b49f5dd..e7bdcb2 100644 > --- a/gnu/packages/lisp.scm > +++ b/gnu/packages/lisp.scm > @@ -458,13 +458,13 @@ interface.") > 'install > (lambda* (#:key outputs inputs #:allow-other-keys) > (let* ((out (assoc-ref outputs "out")) > - (bin (string-append out "/bin"))) > + (bin (string-append out "/bin")) > + (doc (string-append (assoc-ref outputs "doc") > + "/share/doc/lispf4"))) > (install-file "lispf4" bin) > (install-file "SYSATOMS" bin) > (install-file "BASIC.IMG" bin) > - (let* ((doc (assoc-ref outputs "doc")) > - (doc (string-append doc "/share/doc/lispf4"))) > - (copy-recursively "Documentation" doc))) > + (copy-recursively "Documentation" doc)) > #t))))) > (synopsis "InterLisp interpreter") > (description -- ng