46/210: gnu: mes-boot: Update to 0.13.

[Jan Nieuwenhuizen]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 7750de03db319e57635e3a74fc88a2fbc788d5f1
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Fri Apr 27 20:36:20 2018 +0200

    gnu: mes-boot: Update to 0.13.
    
    * gnu/packages/mes.scm (mes-boot): Update to 0.13.  Use new gitlab url 
scheme.
---
 gnu/packages/mes.scm | 54 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index e12dad6..0c02e29 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -222,9 +222,9 @@ hex2 linker.")
        (license gpl3+)))))
 
 (define-public mes-boot
-  (let ((version "0.12")
+  (let ((version "0.13")
         (revision "0")
-        (commit "96f02cd608a5669081cafd52beaef70b02f5e248"))
+        (commit "9aa04a854940aec2683c1cc62205cea6da6f02a2"))
     (package-with-bootstrap-guile
      (package
        (name "mes-boot")
@@ -233,18 +233,18 @@ hex2 linker.")
        (source (origin
                  (method url-fetch)
                  (uri (string-append "https://gitlab.com/janneke/mes";
-                                     "/repository/archive.tar.gz?ref="
-                                     commit))
-                 (file-name (string-append name "-" version ".tar.xz"))
+                                     "/-/archive/" commit
+                                     "/mes-" commit ".tar.gz"))
                  (sha256
                   (base32
-                   "0b7q9inlwizssiz9wfqjqs7pb4xqfnsgfw4cz6anj6gm6xr28fqb"))))
+                   "065vlpjpwnzv7h7my39zb0f7bk2zrsh08g4m7si6p7m0330n3x2z"))))
        (build-system trivial-build-system)
        (supported-systems '("i686-linux" "x86_64-linux"))
        (native-inputs
         `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
           ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
-          ("guile" ,%bootstrap-guile)
+          ;; For testing with Guile
+          ;; ("guile" ,%bootstrap-guile)
           ;; guile-2.0.9 does not have srfi-43; cherry-pick
           ("srfi-43" ,%srfi-43)
           ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
@@ -268,11 +268,12 @@ hex2 linker.")
                    (mes-seed (assoc-ref %build-inputs "mes-seed"))
                    (out (assoc-ref %outputs "out"))
                    (dir (getcwd)))
-              (setenv "PATH" (string-append bash "/bin:"
-                                            guile "/bin:"
-                                            mescc-tools "/bin:"
-                                            tar "/bin:"
-                                            xz "/bin"))
+              (setenv "PATH" (string-append
+                              bash "/bin:"
+                              (if guile (string-append guile "/bin:") "")
+                              mescc-tools "/bin:"
+                              tar "/bin:"
+                              xz "/bin"))
               (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
               (mkdir-p "source")
               (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
@@ -284,26 +285,35 @@ hex2 linker.")
               (system* "cp" srfi-43 "srfi/srfi-43.scm")
               (chdir "source")
               (setenv "PREFIX" out)
-              (setenv "GUILE_AUTO_COMPILE" "1")
-              (setenv "GUILE_LOAD_COMPILED_PATH"
-                      (string-append guile "/lib/guile/2.0/ccache"))
-              (setenv "GUILE_LOAD_PATH"
-                      (string-append "../nyacc-source/module"
-                                     ":" dir
-                                     ":" guile "/share/guile/2.0/"))
+              (when guile
+                (setenv "GUILE_AUTO_COMPILE" "1")
+                (setenv "GUILE_LOAD_COMPILED_PATH"
+                        (string-append guile "/lib/guile/2.0/ccache"))
+                (setenv "GUILE_LOAD_PATH"
+                        (string-append "../nyacc-source/module"
+                                       ":" dir
+                                       ":" guile "/share/guile/2.0/")))
               ;; give auto-compile a home -- massive speed-up
               (mkdir-p "/tmp/home")
               (setenv "HOME" "/tmp/home")
               (and
                (zero? (system* "sh" "build.sh"))
-               (begin
+               (and
+                 (symlink (string-append "../nyacc-source/module") "nyacc")
+                 ;; guile-2.0 fails
+                 (delete-file "tests/srfi-43.test-guile")
+                 (when (not guile)
+                   (setenv "GUILE" "true"))
+                 (setenv "GUILE_LOAD_PATH" "nyacc")
                  (setenv "MES" "src/mes")
                  (setenv "MES_MODULEDIR" "module")
-                 (setenv "MESCC" "scripts/mescc.mes")
+                 (setenv "MESCC" "scripts/mescc")
+                 (zero? (system* "sh" "-x" "test.sh"))
+                 (zero? (system* "sh" "-x" "test.sh" "63-struct-cell"))
                  (zero? (system* "sh" "check.sh")))
                (zero? (system* "sh" "install.sh")))))))
        (description
-     "Mes [Maxwell Equations of Software] aims to create full source
+        "Mes [Maxwell Equations of Software] aims to create full source
 bootstrapping for GuixSD.  It consists of a mutual self-hosting [close to
 Guile-] Scheme interpreter prototype in C and a Nyacc-based C compiler in
 [Guile] Scheme.") ; []