From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Bavier Subject: 02/02: import: Update opam importer. Date: Tue, 18 Dec 2018 21:26:18 -0600 Message-ID: <20181218212618.4f655d4e@centurylink.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/mCepeMk5uUyIllcx94h2=Ah"; protocol="application/pgp-signature" Return-path: In-Reply-To: 20181217204500.3770F20538@vcs0.savannah.gnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-commits-bounces+gcggs-guix-commits=m.gmane.org@gnu.org Sender: "Guix-commits" To: julien@lepiller.eu Cc: guix-devel@gnu.org, guix-commits@gnu.org List-Id: guix-devel.gnu.org --Sig_/mCepeMk5uUyIllcx94h2=Ah Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable > commit cce654fabdf09cac7d18f9bad842ba8445aa022c > Author: Julien Lepiller > Date: Mon Dec 17 21:05:35 2018 +0100 >=20 > import: Update opam importer. > =20 > * guix/import/opam.scm: Update importer for opam 2. > * tests/opam.scm: Update tests for the opam 2 importer. > --- > guix/import/opam.scm | 305 ++++++++++++++++++++++++++++-----------------= ------ > po/guix/POTFILES.in | 1 + > tests/opam.scm | 225 +++++++++++++++++++++++++------------ > 3 files changed, 321 insertions(+), 210 deletions(-) >=20 > diff --git a/guix/import/opam.scm b/guix/import/opam.scm > index f252bdc..c42a5d7 100644 > --- a/guix/import/opam.scm > +++ b/guix/import/opam.scm > @@ -17,132 +17,108 @@ > ;;; along with GNU Guix. If not, see . > =20 > (define-module (guix import opam) > + #:use-module (ice-9 ftw) > #:use-module (ice-9 match) > - #:use-module (ice-9 vlist) > + #:use-module (ice-9 peg) This commit breaks Guix compatibility with Guile 2.0: $ guix build -K --with-commit=3Dguile2.0-guix=3Dcce654fabf guile2.0-guix <...snip...> LOAD guix/import/opam.scm Backtrace: In ice-9/r4rs.scm: 90: 19 [dynamic-wind # ...] In ice-9/eval.scm: 432: 18 [eval # #] 432: 17 [eval # #] 481: 16 [lp (#) (#)] In ice-9/boot-9.scm: 2900: 15 [resolve-interface (guix import opam) #:select ...] 2825: 14 [# # ...] In ice-9/r4rs.scm: 90: 13 [dynamic-wind # ...] In ice-9/boot-9.scm: 3101: 12 [try-module-autoload (guix import opam) #f] 2412: 11 [save-module-excursion #] 3121: 10 [#] In unknown file: ?: 9 [primitive-load-path "guix/import/opam" ...] In ice-9/eval.scm: 505: 8 [# (define-module #= # ...)] In ice-9/psyntax.scm: 1107: 7 [expand-top-sequence ((define-module # # # ...)) () ((top)) ...] 990: 6 [scan ((define-module (guix import opam) #:use-module ...)) () ...] 279: 5 [scan ((#(syntax-object let # ...) (#) (# #) ...)) () ...] In ice-9/eval.scm: 411: 4 [eval # ()] In ice-9/boot-9.scm: 2987: 3 [define-module* (guix import opam) #:filename ...] 2962: 2 [resolve-imports (((ice-9 ftw)) ((ice-9 match)) ((ice-9 peg)) ...)] 2903: 1 [resolve-interface (ice-9 peg) #:select ...] In unknown file: ?: 0 [scm-error misc-error #f "~A ~S" ("no code for module" (ice-9 peg))= #f] ERROR: In procedure scm-error: ERROR: no code for module (ice-9 peg) make[2]: *** [Makefile:5572: make-go] Error 1 make[2]: Leaving directory '/tmp/guix-build-guile2.0-guix-git.cce654f.drv-0= /source' make[1]: *** [Makefile:4653: all-recursive] Error 1 make[1]: Leaving directory '/tmp/guix-build-guile2.0-guix-git.cce654f.drv-0= /source' make: *** [Makefile:3269: all] Error 2 I'm hesitant to suggest that we just update our requirements to Guile 2.2 (though I know Ludovic wants to do that eventually), since I think that would just makes things that much harder for anyone who wants to build Guix from source on a foreign distro. Debian stable does not have Guile 2.2 (it's at Guile 2.0.13). OTOH, I'm don't now how to keep this code working on Guile 2.0.13. `~Eric --Sig_/mCepeMk5uUyIllcx94h2=Ah Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEoMXjUi7471xkzbfw/XPKxxnTJWYFAlwZuloACgkQ/XPKxxnT JWb5AA//X/4dEHylWdMLx+6OYQSApz/OS+rsl6yodldxECmb9T2/jXLp93MqXu36 u6wfCVvtXk/EH4sBhPPZ2xibyIn2azF6lamBhAKFsJN/R6AsBpN9XHBWuaqXxOq6 H1yVNhQ/F/3szDVsj8f6O7E/oe0q1hZVhlusUdTmQHF3FhxJeoDsyftBFEauY1NO z/40cbA7AzxdcqcYaxwVrRt2giIoq43XpVHQVcwZQw778AdPOdFdG0TBp5zfF5x4 1w2cx69Q8MJ1xb0JPnNBOKjKskiTLvLHbxBxNIJGm2ds7TIzRmgvtTFDGkfU6mR3 f+6sE93XN2xZ+d+oX5Nbpswcj64a19bg2XFWdp9nasbwpNhd1OWN+wpplFchoR7a nNbQp0qy1MOGEnyBeFjD4GUNL0H8AO7ZmDxv8ahzJDvhhNphcQ3w63PI+tiOHGKI KrKpyGnyz+tGREhlDujrUtUZUSvc8aT+uFV1jQo61Q4K0ViIbrv7FwW3Mk2FLuM0 PJBmJezHg6N0j+nchoi2mItjC4FuBvUKdouVj3ig8Rvc4DcIaA4pRrcBatN0ZmOg uahQP9Fa74nUIfPym6rPS+mVOPgsCKi/dmlgYuI8Ih9RWO32Z+FDdRO4O0UT8A/I w4YxjeJhczvQiaWn84RQxWdRI9/bpVfvPHWnWEUlteKMneH/v7s= =JFA0 -----END PGP SIGNATURE----- --Sig_/mCepeMk5uUyIllcx94h2=Ah--