From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH] gnu: add lispf4 Date: Sun, 7 Feb 2016 19:36:08 -0500 Message-ID: <20160208003608.GA6080@jasmine> References: <87y4ax3cf2.fsf@grrlz.net> <87wpqgea7v.fsf@grrlz.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="AqsLC8rIMeq19msA" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSZoP-0006qy-8i for guix-devel@gnu.org; Sun, 07 Feb 2016 19:36:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSZoM-00033j-3H for guix-devel@gnu.org; Sun, 07 Feb 2016 19:36:17 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:43509) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSZoL-00033a-Ia for guix-devel@gnu.org; Sun, 07 Feb 2016 19:36:14 -0500 Content-Disposition: inline In-Reply-To: <87wpqgea7v.fsf@grrlz.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: Nils Gillmann Cc: guix-devel@gnu.org --AqsLC8rIMeq19msA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 :) --AqsLC8rIMeq19msA Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=diff 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 --AqsLC8rIMeq19msA--