[bug#33009] [PATCH 0/3] Some guile@2.0 patches

[bug#33009] [PATCH 0/3] Some guile@2.0 patches

[ericbavier]

From: Eric Bavier <bavier@member.fsf.org>

Hello Guix,

The following are 3 guile@2.0-related patches.

The first fixes our guile2.0-guix package, which has been failing to build for
a little while.

The second adds a new "guix-minimal" package.  The intent is to check that
Guix builds with the minimal requirements that we outline in our README.

The third fixes our new (guix status) when using Guix with guile@2.0.

Thanks,

Eric Bavier (3):
  gnu: guile2.0-guix: Fix build.
  gnu: Add guix-minimal.
  ui: Fix port-buffering with guile@2.0.

 gnu/packages/gnupg.scm              | 12 ++++++++++--
 gnu/packages/guile.scm              | 18 ++++++++++++++++++
 gnu/packages/package-management.scm | 19 +++++++++++++++++--
 guix/status.scm                     |  5 +++--
 tests/status.scm                    |  5 ++++-
 5 files changed, 52 insertions(+), 7 deletions(-)

-- 
2.19.0

[bug#33011] [PATCH 1/3] gnu: guile2.0-guix: Fix build.

[ericbavier]

From: Eric Bavier <bavier@cray.com>

* gnu/packages/gnupg.scm (guile2.0-gcrypt): New variable.
* gnu/packages/guile.scm (guile2.0-sqlite3): New variable.
* gnu/packages/package-management.scm (guile2.0-guix)[propagated-inputs]: Use
them.
---
 gnu/packages/gnupg.scm              | 12 ++++++++++--
 gnu/packages/guile.scm              |  4 ++++
 gnu/packages/package-management.scm |  2 ++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 067a2338d..c38fe6420 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
@@ -67,7 +67,8 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
-  #:use-module (guix build-system python))
+  #:use-module (guix build-system python)
+  #:use-module (srfi srfi-1))

 (define-public libgpg-error
   (package
@@ -485,6 +486,13 @@ strong randomness, and more.  It is implemented using the foreign function
 interface (FFI) of Guile.")
     (license license:gpl3+)))

+(define-public guile2.0-gcrypt
+  (package (inherit guile-gcrypt)
+    (name "guile2.0-gcrypt")
+    (inputs
+     `(("guile" ,guile-2.0)
+       ,@(alist-delete "guile" (package-inputs guile-gcrypt))))))
+
 (define-public python-gpg
   (package
     (name "python-gpg")
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index e223edb9f..912b0218e 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1151,6 +1152,9 @@ Guile's foreign function interface.")
      "This package provides Guile bindings to the SQLite database system.")
     (license license:gpl3+)))

+(define-public guile2.0-sqlite3
+  (package-for-guile-2.0 guile-sqlite3))
+
 (define-public haunt
   (package
     (name "haunt")
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 500abd512..000c28632 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -365,7 +365,9 @@ the Nix package manager.")
        ,@(alist-delete "guile" (package-inputs guix))))
     (propagated-inputs
      `(("gnutls" ,gnutls/guile-2.0)
+       ("guile-gcrypt" ,guile2.0-gcrypt)
        ("guile-json" ,guile2.0-json)
+       ("guile-sqlite3" ,guile2.0-sqlite3)
        ("guile-ssh" ,guile2.0-ssh)
        ("guile-git" ,guile2.0-git)))))

--
2.19.0

[bug#33010] [PATCH 2/3] gnu: Add guix-minimal.

[ericbavier]

From: Eric Bavier <bavier@cray.com>

* gnu/packages/guile.scm (guile-2.0.13): New variable.
* gnu/packages/package-management.scm (guix)[arguments]: Adjust 'wrap-program'
phase to handle "missing" inputs.
(guix-minimal): New variable.
---
 gnu/packages/guile.scm              | 14 ++++++++++++++
 gnu/packages/package-management.scm | 17 +++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 912b0218e..216f7c6d5 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -226,6 +226,20 @@ without requiring the source code to be rewritten.")
    (home-page "https://www.gnu.org/software/guile/")
    (license license:lgpl3+)))
 
+(define-public guile-2.0.13
+  ;; For testing a "minimal" Guix
+  (hidden-package
+   (package (inherit guile-2.0)
+            (name "guile")
+            (version "2.0.13")
+            (source (origin
+                      (method url-fetch)
+                      (uri (string-append "mirror://gnu/guile/guile-" version
+                                          ".tar.xz"))
+                      (sha256
+                       (base32
+                        "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p")))))))
+
 (define-public guile-2.2
   (package (inherit guile-2.0)
     (name "guile")
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 000c28632..4ddcb55f4 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -232,13 +232,13 @@
                                         (map (cut string-append <>
                                                   "/share/guile/site/"
                                                   effective)
-                                             deps)
+                                             (delete #f deps))
                                         ":"))
                                (gopath (string-join
                                         (map (cut string-append <>
                                                   "/lib/guile/" effective
                                                   "/site-ccache")
-                                             deps)
+                                             (delete #f deps))
                                         ":")))
 
                           (wrap-program (string-append out "/bin/guix")
@@ -371,6 +371,19 @@ the Nix package manager.")
        ("guile-ssh" ,guile2.0-ssh)
        ("guile-git" ,guile2.0-git)))))
 
+(define-public guix-minimal
+  (let ((guix guile2.0-guix))
+    (package
+      (inherit guix)
+      (name "guix-minimal")
+      (inputs
+       `(("guile" ,guile-2.0.13)
+         ,@(alist-delete "guile" (package-inputs guix))))
+      (propagated-inputs
+       (fold alist-delete
+             (package-propagated-inputs guix)
+             '("guile-json" "guile-ssh"))))))
+
 (define (source-file? file stat)
   "Return true if FILE is likely a source file, false if it is a typical
 generated file."
-- 
2.19.0

[bug#33012] [PATCH 3/3] ui: Fix port-buffering with guile@2.0.

[ericbavier]

From: Eric Bavier <bavier@cray.com>

* guix/status.scm (build-event-output-port)[guile@2.0]: Do not call 'setvbuf'
on custom binary port.
* tests/status.scm (current-build-output-port, UTF-8 + garbage)[guile@2.0]:
Use "?" in place of REPLACEMENT CHARACTER.
---
 guix/status.scm  | 5 +++--
 tests/status.scm | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/guix/status.scm b/guix/status.scm
index 13537c70c..6dba7e049 100644
--- a/guix/status.scm
+++ b/guix/status.scm
@@ -502,8 +502,9 @@ The second return value is a thunk to retrieve the current state."

   ;; The build port actually receives Unicode strings.
   (set-port-encoding! port "UTF-8")
-  (setvbuf port (cond-expand (guile-2.2 'line) (else _IOLBF)))
-
+  (cond-expand
+    ((and guile-2 (not guile-2.2)) #t)
+    (else (setvbuf port 'line)))
   (values port (lambda () %state)))

 (define (call-with-status-report on-event thunk)
diff --git a/tests/status.scm b/tests/status.scm
index 486ad04dd..846a6f415 100644
--- a/tests/status.scm
+++ b/tests/status.scm
@@ -124,7 +124,10 @@

 (test-equal "current-build-output-port, UTF-8 + garbage"
   ;; What about a mixture of UTF-8 + garbage?
-  '((build-log "garbage: �lambda: λ\n"))
+  (let ((replacement (cond-expand
+                      ((and guile-2 (not guile-2.2)) "?")
+                      (else "�"))))
+    `((build-log ,(string-append "garbage: " replacement "lambda: λ\n"))))
   (let-values (((port get-status) (build-event-output-port cons '())))
     (display "garbage: " port)
     (put-bytevector port #vu8(128))
--
2.19.0

[bug#33011] [PATCH 1/3] gnu: guile2.0-guix: Fix build.

[Ludovic Courtès]

Hello Eric,

ericbavier@centurylink.net skribis:

> From: Eric Bavier <bavier@cray.com>
>
> * gnu/packages/gnupg.scm (guile2.0-gcrypt): New variable.
> * gnu/packages/guile.scm (guile2.0-sqlite3): New variable.
> * gnu/packages/package-management.scm (guile2.0-guix)[propagated-inputs]: Use
> them.

LGTM, thanks!

As discussed on IRC, I still plan to remove support for Guile 2.0
soonish, but in the meantime I think this patch doesn’t hurt.

Ludo’.

[bug#33010] [PATCH 2/3] gnu: Add guix-minimal.

[Ludovic Courtès]

Hi,

ericbavier@centurylink.net skribis:

> From: Eric Bavier <bavier@cray.com>
>
> * gnu/packages/guile.scm (guile-2.0.13): New variable.
> * gnu/packages/package-management.scm (guix)[arguments]: Adjust 'wrap-program'
> phase to handle "missing" inputs.
> (guix-minimal): New variable.

What’s the intended use case?  Is it to check that Guix compiles against
an old Guile 2.0 and without optional dependencies?

I wonder whether we should add packages “just” for this, especially
given that 2.0 support is reaching end-of-life and that 2.0.13 is pretty
old.

Thank you,
Ludo’.

[bug#33012] [PATCH 3/3] ui: Fix port-buffering with guile@2.0.

[Ludovic Courtès]

ericbavier@centurylink.net skribis:

> From: Eric Bavier <bavier@cray.com>
>
> * guix/status.scm (build-event-output-port)[guile@2.0]: Do not call 'setvbuf'
> on custom binary port.
> * tests/status.scm (current-build-output-port, UTF-8 + garbage)[guile@2.0]:
> Use "?" in place of REPLACEMENT CHARACTER.

LGTM, thanks!

Ludo'.

[bug#33010] [PATCH 2/3] gnu: Add guix-minimal.

[Efraim Flashner]

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

On Sun, Oct 14, 2018 at 11:42:58PM +0200, Ludovic Courtès wrote:
> Hi,
> 
> ericbavier@centurylink.net skribis:
> 
> > From: Eric Bavier <bavier@cray.com>
> >
> > * gnu/packages/guile.scm (guile-2.0.13): New variable.
> > * gnu/packages/package-management.scm (guix)[arguments]: Adjust 'wrap-program'
> > phase to handle "missing" inputs.
> > (guix-minimal): New variable.
> 
> What’s the intended use case?  Is it to check that Guix compiles against
> an old Guile 2.0 and without optional dependencies?
> 
> I wonder whether we should add packages “just” for this, especially
> given that 2.0 support is reaching end-of-life and that 2.0.13 is pretty
> old.
> 

It might be old but it's still hanging around. Right now iirc Debian
stable and Ubuntu 18.04 both ship with Guile-2.0 and with guile packages
built against it. If someone wanted to build Guix from source using the
various guile libraries there's a fair amount of packaging to do.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[bug#33010] [PATCH 2/3] gnu: Add guix-minimal.

[Eric Bavier]

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

On Sun, 14 Oct 2018 23:42:58 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Hi,
> 
> ericbavier@centurylink.net skribis:
> 
> > From: Eric Bavier <bavier@cray.com>
> >
> > * gnu/packages/guile.scm (guile-2.0.13): New variable.
> > * gnu/packages/package-management.scm (guix)[arguments]: Adjust 'wrap-program'
> > phase to handle "missing" inputs.
> > (guix-minimal): New variable.  
> 
> What’s the intended use case?  Is it to check that Guix compiles against
> an old Guile 2.0 and without optional dependencies?

Right, to make sure that what we're advertising to the outside
world as far as minimum dependencies will actually work.

> 
> I wonder whether we should add packages “just” for this, especially
> given that 2.0 support is reaching end-of-life and that 2.0.13 is pretty
> old.

This package would be updated as needed to reflect changes in Guix
dependencies.

`~Eric

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

[bug#33010] [PATCH 2/3] gnu: Add guix-minimal.

[Jonathan Brielmaier]

On 10/15/18 11:02 AM, Efraim Flashner wrote:
> On Sun, Oct 14, 2018 at 11:42:58PM +0200, Ludovic Courtès wrote:
>> Hi,
>>
>> ericbavier@centurylink.net skribis:
>>
>>> From: Eric Bavier <bavier@cray.com>
>>>
>>> * gnu/packages/guile.scm (guile-2.0.13): New variable.
>>> * gnu/packages/package-management.scm (guix)[arguments]: Adjust 'wrap-program'
>>> phase to handle "missing" inputs.
>>> (guix-minimal): New variable.
>>
>> What’s the intended use case?  Is it to check that Guix compiles against
>> an old Guile 2.0 and without optional dependencies?
>>
>> I wonder whether we should add packages “just” for this, especially
>> given that 2.0 support is reaching end-of-life and that 2.0.13 is pretty
>> old.
>>
> 
> It might be old but it's still hanging around. Right now iirc Debian
> stable and Ubuntu 18.04 both ship with Guile-2.0 and with guile packages
> built against it. If someone wanted to build Guix from source using the
> various guile libraries there's a fair amount of packaging to do.
> 

I'm still work to bring guile2.2 to openSUSE. The problem is that
autogen 5.18.14 has no guile2.2 support, the new release of autogen
5.18.16 should have it. I'm still trying to get it building...

The whole status of guix with guile2.2 on openSUSE can be found here.
Not that it's very work-in-progress:
https://build.opensuse.org/project/show/home:sleep_walker:guile

[bug#33010] [PATCH 2/3] gnu: Add guix-minimal.

[Ludovic Courtès]

Jonathan Brielmaier <jonathan.brielmaier@web.de> skribis:

> I'm still work to bring guile2.2 to openSUSE. The problem is that
> autogen 5.18.14 has no guile2.2 support, the new release of autogen
> 5.18.16 should have it. I'm still trying to get it building...

Note that it’s possible to have 2.0 and 2.2 (and 3.0) installed in
parallel:

  https://www.gnu.org/software/guile/manual/html_node/Parallel-Installations.html

So you don’t have to switch all packages to Guile 2.2 overnight.

> The whole status of guix with guile2.2 on openSUSE can be found here.
> Not that it's very work-in-progress:
> https://build.opensuse.org/project/show/home:sleep_walker:guile

Neat, thanks a lot for your work on this!  (And thanks to Tomáš as
well!)

Ludo’.

[bug#33010] [PATCH 2/3] gnu: Add guix-minimal.

[Ludovic Courtès]

Eric Bavier <ericbavier@centurylink.net> skribis:

> On Sun, 14 Oct 2018 23:42:58 +0200
> ludo@gnu.org (Ludovic Courtès) wrote:
>
>> Hi,
>> 
>> ericbavier@centurylink.net skribis:
>> 
>> > From: Eric Bavier <bavier@cray.com>
>> >
>> > * gnu/packages/guile.scm (guile-2.0.13): New variable.
>> > * gnu/packages/package-management.scm (guix)[arguments]: Adjust 'wrap-program'
>> > phase to handle "missing" inputs.
>> > (guix-minimal): New variable.  
>> 
>> What’s the intended use case?  Is it to check that Guix compiles against
>> an old Guile 2.0 and without optional dependencies?
>
> Right, to make sure that what we're advertising to the outside
> world as far as minimum dependencies will actually work.

I see.

>> I wonder whether we should add packages “just” for this, especially
>> given that 2.0 support is reaching end-of-life and that 2.0.13 is pretty
>> old.
>
> This package would be updated as needed to reflect changes in Guix
> dependencies.

OK.  It does sound like an interesting CI job, but maybe not great as a
package users can install.  Though of course we can mark it as hidden
and then it’s just an easy way to write that CI job.  Thoughts?

Ludo’.

[bug#33010] [PATCH 2/3] gnu: Add guix-minimal.

[Eric Bavier]

On Mon, Oct 15, 2018 at 09:28:31PM +0200, Ludovic Courtès wrote:
> Eric Bavier <ericbavier@centurylink.net> skribis:
> 
> > On Sun, 14 Oct 2018 23:42:58 +0200
> > ludo@gnu.org (Ludovic Courtès) wrote:
> >> I wonder whether we should add packages “just” for this, especially
> >> given that 2.0 support is reaching end-of-life and that 2.0.13 is pretty
> >> old.
> >
> > This package would be updated as needed to reflect changes in Guix
> > dependencies.
> 
> OK.  It does sound like an interesting CI job, but maybe not great as a
> package users can install.  Though of course we can mark it as hidden
> and then it’s just an easy way to write that CI job.  Thoughts?

I think marking it "hidden" would be fine.  Do the build farms
automatically build hidden packages too?

-- 
Eric Bavier, Scientific Libraries, Cray Inc.

[bug#33010] [PATCH 2/3] gnu: Add guix-minimal.

[Ludovic Courtès]

Hi Eric,

Eric Bavier <bavier@cray.com> skribis:

> On Mon, Oct 15, 2018 at 09:28:31PM +0200, Ludovic Courtès wrote:
>> Eric Bavier <ericbavier@centurylink.net> skribis:
>> 
>> > On Sun, 14 Oct 2018 23:42:58 +0200
>> > ludo@gnu.org (Ludovic Courtès) wrote:
>> >> I wonder whether we should add packages “just” for this, especially
>> >> given that 2.0 support is reaching end-of-life and that 2.0.13 is pretty
>> >> old.
>> >
>> > This package would be updated as needed to reflect changes in Guix
>> > dependencies.
>> 
>> OK.  It does sound like an interesting CI job, but maybe not great as a
>> package users can install.  Though of course we can mark it as hidden
>> and then it’s just an easy way to write that CI job.  Thoughts?
>
> I think marking it "hidden" would be fine.

OK, let’s do that, along with a comment explaining the purpose of this
package.

> Do the build farms automatically build hidden packages too?

Yes I think so (see ‘all-packages’ in build-aux/hydra/gnu-system.scm.)

Thanks!

Ludo’.

bug#33012: [PATCH 3/3] ui: Fix port-buffering with guile@2.0.

[Eric Bavier]

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

On Sun, 14 Oct 2018 23:43:28 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> ericbavier@centurylink.net skribis:
> 
> > From: Eric Bavier <bavier@cray.com>
> >
> > * guix/status.scm (build-event-output-port)[guile@2.0]: Do not call 'setvbuf'
> > on custom binary port.
> > * tests/status.scm (current-build-output-port, UTF-8 + garbage)[guile@2.0]:
> > Use "?" in place of REPLACEMENT CHARACTER.  
> 
> LGTM, thanks!
> 
> Ludo'.

Pushed in 278f86a43f1561b1c064ce88da012db414ec7efc

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

bug#33010: [PATCH 2/3] gnu: Add guix-minimal.

[Eric Bavier]

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

On Tue, 16 Oct 2018 13:28:01 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Hi Eric,
> 
> Eric Bavier <bavier@cray.com> skribis:
> 
> > On Mon, Oct 15, 2018 at 09:28:31PM +0200, Ludovic Courtès wrote:  
> >> Eric Bavier <ericbavier@centurylink.net> skribis:
> >>   
> >> > On Sun, 14 Oct 2018 23:42:58 +0200
> >> > ludo@gnu.org (Ludovic Courtès) wrote:  
> >> >> I wonder whether we should add packages “just” for this, especially
> >> >> given that 2.0 support is reaching end-of-life and that 2.0.13 is pretty
> >> >> old.  
> >> >
> >> > This package would be updated as needed to reflect changes in Guix
> >> > dependencies.  
> >> 
> >> OK.  It does sound like an interesting CI job, but maybe not great as a
> >> package users can install.  Though of course we can mark it as hidden
> >> and then it’s just an easy way to write that CI job.  Thoughts?  
> >
> > I think marking it "hidden" would be fine.  
> 
> OK, let’s do that, along with a comment explaining the purpose of this
> package.


Pushed with the above changes in
6f1ce09d79fa6148459c90120881e825551651b2

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

bug#33011: [PATCH 1/3] gnu: guile2.0-guix: Fix build.

[Eric Bavier]

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

On Sun, 14 Oct 2018 23:39:30 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Hello Eric,
> 
> ericbavier@centurylink.net skribis:
> 
> > From: Eric Bavier <bavier@cray.com>
> >
> > * gnu/packages/gnupg.scm (guile2.0-gcrypt): New variable.
> > * gnu/packages/guile.scm (guile2.0-sqlite3): New variable.
> > * gnu/packages/package-management.scm (guile2.0-guix)[propagated-inputs]: Use
> > them.  
> 
> LGTM, thanks!
> 
> As discussed on IRC, I still plan to remove support for Guile 2.0
> soonish, but in the meantime I think this patch doesn’t hurt.

OK.

Pushed in c8e3651a824bbc28915802265d9a5e7cc6405eea

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