Re: [PATCH] gnu: add lispf4

[Nils Gillmann <niasterisk@grrlz.net>]

Leo Famulari <leo@famulari.name> writes:

> On Sun, Feb 07, 2016 at 05:50:12PM +0100, Nils Gillmann wrote:
>> Nils Gillmann <niasterisk@grrlz.net> 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 <niasterisk@grrlz.net>
>> 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