[PATCH] Fix & update guile-lib to 0.2.5

[PATCH] Fix & update guile-lib to 0.2.5

[Maxim Cournoyer]

[-- Attachment #1.1: Type: text/plain, Size: 268 bytes --]

Hello Guix!

While attempting to reconfigure my system I encountered a failure to
build guile-lib. The guile-lib 0.2.3 archive could not be found at the
original URL anymore.

I've used this as an opportunity to update the package and clean it a
bit.

Thanks!

Maxim


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-guile-lib-Update-to-0.2.5.patch --]
[-- Type: text/x-patch, Size: 3246 bytes --]

From 34ffe35bb78409d255f1987d38d7ce4fe77f12d3 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sat, 4 Mar 2017 22:10:41 -0800
Subject: [PATCH] gnu: guile-lib: Update to 0.2.5

The build was broken since the URL of version 0.2.3 was changed. The archive
was moved into an "old" subdirectory of the original location.

* gnu/packages/guile.scm (guile-lib): Update to 0.2.5.
[make-flags]: Add GUILE_AUTO_COMPILE to prevent guild errors.
[phases]: Remove 'check replacement since it is no longer needed.
---
 gnu/packages/guile.scm | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 293579b1be..4440c6c602 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -632,32 +632,29 @@ The library is shipped with documentation in Info format and usage examples.")
 (define-public guile-lib
   (package
     (name "guile-lib")
-    (version "0.2.3")
+    (version "0.2.5")
     (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://savannah/guile-lib/guile-lib-"
-                                 version ".tar.gz"))
-             (sha256
-              (base32
-               "0pwdd52vakni1fabaiav8v0ad7xp3bx8x3brijbr1mpgamm9dxqc"))))
+              (method url-fetch)
+              (uri (string-append "mirror://savannah/guile-lib/guile-lib-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1qbk485djgxqrbfjvk4b7w7y4x9xygf2qb8dqnl7885kajasx8qg"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-before 'configure 'patch-module-dir
-                    (lambda _
-                      (substitute* "src/Makefile.in"
-                        (("^moddir = ([[:graph:]]+)")
-                         "moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@\n")
-                        (("^godir = ([[:graph:]]+)")
-                         "godir = \
+     '(#:make-flags
+       '("GUILE_AUTO_COMPILE=0")        ;to prevent guild errors
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-module-dir
+           (lambda _
+             (substitute* "src/Makefile.in"
+               (("^moddir = ([[:graph:]]+)")
+                "moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@\n")
+               (("^godir = ([[:graph:]]+)")
+                "godir = \
 $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))
-                      #t))
-                  (replace 'check
-                    (lambda _
-                      ;; Work around a harmless test failure involving
-                      ;; two-spaces-after-period rendering.
-                      (zero? (system* "make" "check" ;"-C" "unit-tests"
-                                      "XFAIL_TESTS=texinfo.serialize.scm")))))))
+             #t)))))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs `(("guile" ,guile-2.0)))
     (home-page "http://www.nongnu.org/guile-lib/")
-- 
2.11.1


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

Re: [PATCH] Fix & update guile-lib to 0.2.5

[Ludovic Courtès]

Hi Maxim,

Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:

> From 34ffe35bb78409d255f1987d38d7ce4fe77f12d3 Mon Sep 17 00:00:00 2001
> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> Date: Sat, 4 Mar 2017 22:10:41 -0800
> Subject: [PATCH] gnu: guile-lib: Update to 0.2.5
>
> The build was broken since the URL of version 0.2.3 was changed. The archive
> was moved into an "old" subdirectory of the original location.
>
> * gnu/packages/guile.scm (guile-lib): Update to 0.2.5.
> [make-flags]: Add GUILE_AUTO_COMPILE to prevent guild errors.
> [phases]: Remove 'check replacement since it is no longer needed.

Awesome.  Applied, thanks!

I tried “guix build guile-lib --with-input=guile=guile-next” and found
that there are two test failures:

--8<---------------cut here---------------start------------->8---
Running test suite: <test-string-wrapper>-suite -----------------------
Running test case: test-util-equivalent-to-class
Running test case: test-fill-equivalent-to-joined-lines
Running test case: test-no-collapse-ws
Running test case: test-no-word-break
test-util-equivalent-to-class: exception in test: (out-of-range "vector-ref" "Value out of range: ~S" (3) (3))
test-no-collapse-ws: exception in test: (out-of-range "vector-ref" "Value out of range: ~S" (3) (3))

4 run, 2 failed
FAIL: string.wrap.scm
--8<---------------cut here---------------end--------------->8---

It would be nice to fix it (or work around it) so we can move more stuff
to Guile 2.2 soon.

Ludo’.

Re: [PATCH] Fix & update guile-lib to 0.2.5

[Maxim Cournoyer]

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

Hi Ludovic,

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

> Hi Maxim,
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:
>
>> From 34ffe35bb78409d255f1987d38d7ce4fe77f12d3 Mon Sep 17 00:00:00 2001
>> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
>> Date: Sat, 4 Mar 2017 22:10:41 -0800
>> Subject: [PATCH] gnu: guile-lib: Update to 0.2.5
>>
>> The build was broken since the URL of version 0.2.3 was changed. The archive
>> was moved into an "old" subdirectory of the original location.
>>
>> * gnu/packages/guile.scm (guile-lib): Update to 0.2.5.
>> [make-flags]: Add GUILE_AUTO_COMPILE to prevent guild errors.
>> [phases]: Remove 'check replacement since it is no longer needed.
>
> Awesome.  Applied, thanks!
>

That was quick! Thanks.

> I tried “guix build guile-lib --with-input=guile=guile-next” and found
> that there are two test failures:
>
> Running test suite: <test-string-wrapper>-suite -----------------------
> Running test case: test-util-equivalent-to-class
> Running test case: test-fill-equivalent-to-joined-lines
> Running test case: test-no-collapse-ws
> Running test case: test-no-word-break
> test-util-equivalent-to-class: exception in test: (out-of-range "vector-ref" "Value out of range: ~S" (3) (3))
> test-no-collapse-ws: exception in test: (out-of-range "vector-ref" "Value out of range: ~S" (3) (3))
>
> 4 run, 2 failed
> FAIL: string.wrap.scm
>
> It would be nice to fix it (or work around it) so we can move more stuff
> to Guile 2.2 soon.
>
> Ludo’.

It would be nice, indeed! Not sure why the tests are failing with Guile
2.2.  Are there known incompatibilities between Guile 2.0 and Guile 2.2?

Maxim

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

Re: [PATCH] Fix & update guile-lib to 0.2.5

[David Pirotte]

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

Hi,

> > Running test suite: <test-string-wrapper>-suite -----------------------
> > Running test case: test-util-equivalent-to-class
> > Running test case: test-fill-equivalent-to-joined-lines
> > Running test case: test-no-collapse-ws
> > Running test case: test-no-word-break
> > test-util-equivalent-to-class: exception in test: (out-of-range "vector-ref"
> > "Value out of range: ~S" (3) (3)) test-no-collapse-ws: exception in test:
> > (out-of-range "vector-ref" "Value out of range: ~S" (3) (3))
> >
> > 4 run, 2 failed
> > FAIL: string.wrap.scm
> >
> > It would be nice to fix it (or work around it) so we can move more stuff
> > to Guile 2.2 soon.
> >
> > Ludo’.  
> 
> It would be nice, indeed! Not sure why the tests are failing with Guile
> 2.2.  Are there known incompatibilities between Guile 2.0 and Guile 2.2?

This was a goops related bug, fiexed in master, just after 2.1.7 was released, it
will be in 2.1.8 of course...

	http://git.savannah.gnu.org/cgit/guile.git/commit/?id=c7fb87cd6e8ccf7e2a47c715a1d4a6cf82d846a3

David

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