Re: 01/03: gnu: ikiwiki: Revert to standard wrapper.

Re: 01/03: gnu: ikiwiki: Revert to standard wrapper.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1677 bytes --]


guix-commits@gnu.org writes:

> pgarlick pushed a commit to branch master
> in repository guix.
>
> commit a0362fdea9369b7927704e48cfc6c578213019ce
> Author: Paul Garlick <pgarlick@tourbillion-technology.com>
> AuthorDate: Thu May 28 10:34:40 2020 +0100
>
>     gnu: ikiwiki: Revert to standard wrapper.
>
>     * gnu/packages/web.scm (ikiwiki)[arguments]: Remove
>     unnecessary 'include-PERL5LIB-in-wrapper' phase.  The PERL5LIB
>     environment variable may be set in the user's setup file instead.
> ---
>  gnu/packages/web.scm | 9 ---------
>  1 file changed, 9 deletions(-)
>
> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
> index 6467184..b020a6f 100644
> --- a/gnu/packages/web.scm
> +++ b/gnu/packages/web.scm
> @@ -4850,15 +4850,6 @@ NetSurf project.")
>      (arguments
>       `(#:phases
>         (modify-phases %standard-phases
> -         (add-after 'unpack 'include-PERL5LIB-in-wrapper
> -           (lambda _
> -             (substitute* "IkiWiki/Wrapper.pm"
> -               (("^@wrapper\\_hooks")
> -                (string-append
> -                 "@wrapper_hooks\n"
> -                 "        addenv(\"PERL5LIB\", \""
> -                 (getenv "PERL5LIB")
> -                 "\");")))))
>           (add-after 'patch-source-shebangs 'patch-Makefiles
>             (lambda _
>               (substitute* "Makefile.PL"

Hi Paul,

So if I remember correctly, this was added so that the Ikiwiki CGI
functionality works, and the commit message mentions this [1]

1: http://git.savannah.gnu.org/cgit/guix.git/commit/?id=f4dd303282dc0bfd88606e383c0cf98f3742f771

Can you confirm if this is still the case with this change?

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

Re: 01/03: gnu: ikiwiki: Revert to standard wrapper.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1862 bytes --]


Christopher Baines <mail@cbaines.net> writes:

> guix-commits@gnu.org writes:
>
>> pgarlick pushed a commit to branch master
>> in repository guix.
>>
>> commit a0362fdea9369b7927704e48cfc6c578213019ce
>> Author: Paul Garlick <pgarlick@tourbillion-technology.com>
>> AuthorDate: Thu May 28 10:34:40 2020 +0100
>>
>>     gnu: ikiwiki: Revert to standard wrapper.
>>
>>     * gnu/packages/web.scm (ikiwiki)[arguments]: Remove
>>     unnecessary 'include-PERL5LIB-in-wrapper' phase.  The PERL5LIB
>>     environment variable may be set in the user's setup file instead.
>> ---
>>  gnu/packages/web.scm | 9 ---------
>>  1 file changed, 9 deletions(-)
>>
>> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
>> index 6467184..b020a6f 100644
>> --- a/gnu/packages/web.scm
>> +++ b/gnu/packages/web.scm
>> @@ -4850,15 +4850,6 @@ NetSurf project.")
>>      (arguments
>>       `(#:phases
>>         (modify-phases %standard-phases
>> -         (add-after 'unpack 'include-PERL5LIB-in-wrapper
>> -           (lambda _
>> -             (substitute* "IkiWiki/Wrapper.pm"
>> -               (("^@wrapper\\_hooks")
>> -                (string-append
>> -                 "@wrapper_hooks\n"
>> -                 "        addenv(\"PERL5LIB\", \""
>> -                 (getenv "PERL5LIB")
>> -                 "\");")))))
>>           (add-after 'patch-source-shebangs 'patch-Makefiles
>>             (lambda _
>>               (substitute* "Makefile.PL"
>
> Hi Paul,
>
> So if I remember correctly, this was added so that the Ikiwiki CGI
> functionality works, and the commit message mentions this [1]
>
> 1: http://git.savannah.gnu.org/cgit/guix.git/commit/?id=f4dd303282dc0bfd88606e383c0cf98f3742f771

I don't think there was ever a bug report for this, but I think I've
found the IRC conversation for context:

  http://logs.guix.gnu.org/guix/2017-10-17.log#203630

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

Re: 01/03: gnu: ikiwiki: Revert to standard wrapper.

[Paul Garlick]

Hi Chris,

> I don't think there was ever a bug report for this, but I think I've
> found the IRC conversation for context:
> 
>   http://logs.guix.gnu.org/guix/2017-10-17.log#203630

Thank you for this link and taking a look at this patch.

I have been adding the missing inputs to ikiwiki.  In the process I
noticed that the cgi script needs a way of finding the perl
dependencies.  The Debian way of packaging the perl modules allows
ikiwiki to see its dependencies immediately.  In Guix, as you said, it
needs some help via PERL5LIB.

In using ikiwiki I found that I needed to add the PERL5LIB variable to
the setup file anyway, so that the cgi script can see extra modules
that are not needed at build time.  In my setup file there is an 'ENV'
section which contains: 

PERL5LIB: /home/paul/.guix-profile/lib/perl5/site_perl

This means that there is no need to have PERL5LIB in the wrapper. 
Instead the dependencies can be propagated in the normal way.  This
fits in with the PREREQ_PM section of ikiwiki's Makefile.PL.

So far,everything I have tested works as expected.  After the latest
commit 
e642f78f2eaf1d53d656ff3cd86d4dd186e8eb52 all the main tests pass.

Best regards,

Paul.