bug#26841: [PATCH 0/3] core-updates: more fixes for missing dependencies for %modify-phases

bug#26841: [PATCH 0/3] core-updates: more fixes for missing dependencies for %modify-phases

[Sergei Trofimovich]

This time it's 'go', 'zip', and 'sbcl' packages.
Without the dependencies build typically fails as:

$ ./pre-inst-env guix build sbcl --no-substitutes

@ build-started /gnu/store/....-sbcl-1.3.7.drv - x86_64-linux /var/log/guix/drvs/0q//....-sbcl-1.3.7.drv.bz2
ice-9/psyntax.scm:1534:32: In procedure expand-macro:
ice-9/psyntax.scm:1534:32: Syntax error:
/gnu/store/....-sbcl-1.3.7-guile-builder:1:2813: source expression failed to match any pattern in form (%modify-phases phases* (delete (quote configure)))
builder for `/gnu/store/....-sbcl-1.3.7.drv' failed with exit code 1
@ build-failed /gnu/store/....-sbcl-1.3.7.drv - 1 builder for `/gnu/store/....-sbcl-1.3.7.drv' failed with exit code 1
guix build: error: build failed: build of `/gnu/store/....-sbcl-1.3.7.drv' failed

Sergei Trofimovich (3):
  gnu: zip: add missing '#:modules' imports
  gnu: go-1.4: Add missing module imports.
  gnu: sbcl: Add missing module imports

 gnu/packages/golang.scm | 3 ++-
 gnu/packages/lisp.scm   | 5 ++++-
 gnu/packages/zip.scm    | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

-- 
2.12.2

bug#26842: [PATCH 1/3] gnu: zip: add missing '#:modules' imports

[Sergei Trofimovich]

* gnu/packages/zip.scm (zip): add missing '#:modules' imports
---
 gnu/packages/zip.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm
index 2cf30d6e3..cd16f5ad4 100644
--- a/gnu/packages/zip.scm
+++ b/gnu/packages/zip.scm
@@ -48,6 +48,9 @@
                       (list "-f" "unix/Makefile"
                             (string-append "prefix=" out)
                             (string-append "MANDIR=" out "/share/man/man1")))
+       #:modules ((guix build gnu-build-system)
+                  (guix build utils)
+                  (srfi srfi-1))
        #:phases
        (modify-phases %standard-phases
          (replace 'build
-- 
2.12.2

bug#26842: [PATCH 1/3] gnu: zip: add missing '#:modules' imports

[Kei Kebreau]

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

Sergei Trofimovich <slyfox@inbox.ru> writes:

> * gnu/packages/zip.scm (zip): add missing '#:modules' imports
> ---
>  gnu/packages/zip.scm | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm
> index 2cf30d6e3..cd16f5ad4 100644
> --- a/gnu/packages/zip.scm
> +++ b/gnu/packages/zip.scm
> @@ -48,6 +48,9 @@
>                        (list "-f" "unix/Makefile"
>                              (string-append "prefix=" out)
>                              (string-append "MANDIR=" out "/share/man/man1")))
> +       #:modules ((guix build gnu-build-system)
> +                  (guix build utils)
> +                  (srfi srfi-1))
>         #:phases
>         (modify-phases %standard-phases
>           (replace 'build

It looks like this is already on master!

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

bug#26840: [PATCH 2/3] gnu: go-1.4: Add missing module imports.

[Sergei Trofimovich]

* gnu/packages/golang.scm (go-1.4): Add missing modules to
  %modify-phases call: srfi-1
---
 gnu/packages/golang.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 00630ce06..d19aa65af 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -62,7 +62,8 @@
     (arguments
      `(#:modules ((ice-9 match)
                   (guix build gnu-build-system)
-                  (guix build utils))
+                  (guix build utils)
+                  (srfi srfi-1))
        #:tests? #f ; Tests are run by the all.bash script.
        #:phases
        (modify-phases %standard-phases
-- 
2.12.2

bug#26840: [PATCH 2/3] gnu: go-1.4: Add missing module imports.

[Kei Kebreau]

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

Sergei Trofimovich <slyfox@inbox.ru> writes:

> * gnu/packages/golang.scm (go-1.4): Add missing modules to
>   %modify-phases call: srfi-1
> ---
>  gnu/packages/golang.scm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
> index 00630ce06..d19aa65af 100644
> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm
> @@ -62,7 +62,8 @@
>      (arguments
>       `(#:modules ((ice-9 match)
>                    (guix build gnu-build-system)
> -                  (guix build utils))
> +                  (guix build utils)
> +                  (srfi srfi-1))
>         #:tests? #f ; Tests are run by the all.bash script.
>         #:phases
>         (modify-phases %standard-phases

*/me looks at git log and facepalms*

Never mind my other email... I see that the reason these are already on
master is because they were already pushed there. Feel free to close
these!

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

bug#26840: [PATCH 2/3] gnu: go-1.4: Add missing module imports.

[Danny Milosavljevic]

Hi Kei,

> Never mind my other email... I see that the reason these are already on
> master is because they were already pushed there. Feel free to close
> these!

Hehe yeah.  I wonder though:  If I put "Fixes <https://bugs.gnu.org/xxxx>" into the commit log, does that mean that something (a cron job etc) actually marks the bug report as fixed?  How often does that happen?

bug#26840: [PATCH 2/3] gnu: go-1.4: Add missing module imports.

[Kei Kebreau]

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

Danny Milosavljevic <dannym@scratchpost.org> writes:

> Hi Kei,
>
>> Never mind my other email... I see that the reason these are already on
>> master is because they were already pushed there. Feel free to close
>> these!
>
> Hehe yeah.  I wonder though: If I put "Fixes
> <https://bugs.gnu.org/xxxx>" into the commit log, does that mean that
> something (a cron job etc) actually marks the bug report as fixed?
> How often does that happen?

I'm not sure about the log-reading method you describe, but I know that
adding "-done" to the debbugs email closes the bug.

Example: xxxxx@debbugs.gnu.org --> xxxxx-done@debbugs.gnu.org

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

bug#26840: [PATCH 2/3] gnu: go-1.4: Add missing module imports.

[Leo Famulari]

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

On Thu, May 11, 2017 at 11:06:22PM +0200, Danny Milosavljevic wrote:
> Hi Kei,
> 
> > Never mind my other email... I see that the reason these are already on
> > master is because they were already pushed there. Feel free to close
> > these!
> 
> Hehe yeah.  I wonder though:  If I put "Fixes
> <https://bugs.gnu.org/xxxx>" into the commit log, does that mean that
> something (a cron job etc) actually marks the bug report as fixed?
> How often does that happen?

It doesn't happen :)

You have to send mail to the debbugs ticket. For example
<12345-done@debbugs.gnu.org>, where 12345 is the bug number.

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

bug#26840: [PATCH 2/3] gnu: go-1.4: Add missing module imports.

[Marius Bakke]

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

Leo Famulari <leo@famulari.name> writes:

> On Thu, May 11, 2017 at 11:06:22PM +0200, Danny Milosavljevic wrote:
>> Hi Kei,
>> 
>> > Never mind my other email... I see that the reason these are already on
>> > master is because they were already pushed there. Feel free to close
>> > these!
>> 
>> Hehe yeah.  I wonder though:  If I put "Fixes
>> <https://bugs.gnu.org/xxxx>" into the commit log, does that mean that
>> something (a cron job etc) actually marks the bug report as fixed?
>> How often does that happen?
>
> It doesn't happen :)
>
> You have to send mail to the debbugs ticket. For example
> <12345-done@debbugs.gnu.org>, where 12345 is the bug number.

Alternatively, email control@debbugs.gnu.org with "close 12345".

I see it also takes a "version" parameter, e.g. "close 12345 aaabbbccc".

https://debbugs.gnu.org/server-control.html

Useful if you don't want to spam list subscribers with an empty message.

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

bug#26840: [PATCH 2/3] gnu: go-1.4: Add missing module imports.

[Danny Milosavljevic]

On Fri, 12 May 2017 00:19:40 +0200
Marius Bakke <mbakke@fastmail.com> wrote:
> Alternatively, email control@debbugs.gnu.org with "close 12345".
> 
> I see it also takes a "version" parameter, e.g. "close 12345 aaabbbccc".

Nice!

I wonder whether it would be possible to have an auto-closer job?

I think it's not really useful to have to specify that the bug is fixed twice - once in the commit message and once in the bug report.

If we wanted to automate it, who could we ask about it?

bug#26840: [PATCH 2/3] gnu: go-1.4: Add missing module imports.

[Leo Famulari]

On Fri, May 12, 2017 at 12:29:37AM +0200, Danny Milosavljevic wrote:
> I think it's not really useful to have to specify that the bug is
> fixed twice - once in the commit message and once in the bug report.

Are we mentioning the guix-patches bugs in commit messages? I thought it
was just for the items from bug-guix.

bug#26840: [PATCH 2/3] gnu: go-1.4: Add missing module imports.

[Ludovic Courtès]

Hi Kei,

Kei Kebreau <kei@openmailbox.org> skribis:

> Sergei Trofimovich <slyfox@inbox.ru> writes:
>
>> * gnu/packages/golang.scm (go-1.4): Add missing modules to
>>   %modify-phases call: srfi-1
>> ---
>>  gnu/packages/golang.scm | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
>> index 00630ce06..d19aa65af 100644
>> --- a/gnu/packages/golang.scm
>> +++ b/gnu/packages/golang.scm
>> @@ -62,7 +62,8 @@
>>      (arguments
>>       `(#:modules ((ice-9 match)
>>                    (guix build gnu-build-system)
>> -                  (guix build utils))
>> +                  (guix build utils)
>> +                  (srfi srfi-1))
>>         #:tests? #f ; Tests are run by the all.bash script.
>>         #:phases
>>         (modify-phases %standard-phases
>
> */me looks at git log and facepalms*
>
> Never mind my other email... I see that the reason these are already on
> master is because they were already pushed there. Feel free to close
> these!

Though as discussed in another thread with Sergei, it’s not entirely
clear to me that these #:modules patches should be committed (and they
are for ‘core-updates’, not ‘master’.)

I would rather see whether we can find a more generic solution to this
problem before patching every single instance.

How does that sound?

Ludo’.

bug#26840: [PATCH 2/3] gnu: go-1.4: Add missing module imports.

[Kei Kebreau]

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

ludo@gnu.org (Ludovic Courtès) writes:

> Hi Kei,
>
> Kei Kebreau <kei@openmailbox.org> skribis:
>
>> Sergei Trofimovich <slyfox@inbox.ru> writes:
>>
>>> * gnu/packages/golang.scm (go-1.4): Add missing modules to
>>>   %modify-phases call: srfi-1
>>> ---
>>>  gnu/packages/golang.scm | 3 ++-
>>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
>>> index 00630ce06..d19aa65af 100644
>>> --- a/gnu/packages/golang.scm
>>> +++ b/gnu/packages/golang.scm
>>> @@ -62,7 +62,8 @@
>>>      (arguments
>>>       `(#:modules ((ice-9 match)
>>>                    (guix build gnu-build-system)
>>> -                  (guix build utils))
>>> +                  (guix build utils)
>>> +                  (srfi srfi-1))
>>>         #:tests? #f ; Tests are run by the all.bash script.
>>>         #:phases
>>>         (modify-phases %standard-phases
>>
>> */me looks at git log and facepalms*
>>
>> Never mind my other email... I see that the reason these are already on
>> master is because they were already pushed there. Feel free to close
>> these!
>
> Though as discussed in another thread with Sergei, it’s not entirely
> clear to me that these #:modules patches should be committed (and they
> are for ‘core-updates’, not ‘master’.)
>
> I would rather see whether we can find a more generic solution to this
> problem before patching every single instance.
>
> How does that sound?
>
> Ludo’.

I have no objections. Should the patches already on master be reverted,
or should they be left until further notice?

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

bug#26840: [PATCH 2/3] gnu: go-1.4: Add missing module imports.

[Ludovic Courtès]

Kei Kebreau <kei@openmailbox.org> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Hi Kei,
>>
>> Kei Kebreau <kei@openmailbox.org> skribis:
>>
>>> Sergei Trofimovich <slyfox@inbox.ru> writes:
>>>
>>>> * gnu/packages/golang.scm (go-1.4): Add missing modules to
>>>>   %modify-phases call: srfi-1
>>>> ---
>>>>  gnu/packages/golang.scm | 3 ++-
>>>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
>>>> index 00630ce06..d19aa65af 100644
>>>> --- a/gnu/packages/golang.scm
>>>> +++ b/gnu/packages/golang.scm
>>>> @@ -62,7 +62,8 @@
>>>>      (arguments
>>>>       `(#:modules ((ice-9 match)
>>>>                    (guix build gnu-build-system)
>>>> -                  (guix build utils))
>>>> +                  (guix build utils)
>>>> +                  (srfi srfi-1))
>>>>         #:tests? #f ; Tests are run by the all.bash script.
>>>>         #:phases
>>>>         (modify-phases %standard-phases
>>>
>>> */me looks at git log and facepalms*
>>>
>>> Never mind my other email... I see that the reason these are already on
>>> master is because they were already pushed there. Feel free to close
>>> these!
>>
>> Though as discussed in another thread with Sergei, it’s not entirely
>> clear to me that these #:modules patches should be committed (and they
>> are for ‘core-updates’, not ‘master’.)
>>
>> I would rather see whether we can find a more generic solution to this
>> problem before patching every single instance.
>>
>> How does that sound?
>>
>> Ludo’.
>
> I have no objections. Should the patches already on master be reverted,
> or should they be left until further notice?

We can leave them, but let’s not push more without further thought.  :-)

Ludo’.

bug#26843: [PATCH 3/3] gnu: sbcl: Add missing module imports

[Sergei Trofimovich]

* gnu/packages/lisp.scm (sbck): Add missing modules to
  %modify-phases call.
---
 gnu/packages/lisp.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 2bbe39807..889073edb 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -284,7 +284,10 @@ an interpreter, a compiler, a debugger, and much more.")
        ("texlive" ,texlive)
        ("texinfo" ,texinfo)))
     (arguments
-     '(#:phases
+     '(#:modules ((guix build gnu-build-system)
+                  (guix build utils)
+                  (srfi srfi-1))
+       #:phases
        (modify-phases %standard-phases
          (delete 'configure)
          (add-before 'build 'patch-unix-tool-paths
-- 
2.12.2

bug#26841: [PATCH 0/3] core-updates: more fixes for missing dependencies for %modify-phases

[Danny Milosavljevic]

Hi Sergei,

I applied all 3 with very minor corrections (typo) to core-updates and master.

Thanks!