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

commit 5bf29cfb5b8004a48629296c7943059441ce9903
Author: Jan Nieuwenhuizen <jann...@gnu.org>
Date:   Sun Jul 22 22:02:01 2018 +0200

    gnu: mes: Update to 0.17.
    
    * gnu/packages/mes.scm (mes): Update to 0.17.
---
 gnu/packages/mes.scm | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 101e9b0..d366909 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -218,22 +218,31 @@ hex2 linker.")
        (license gpl3+)))))
 
 (define-public mes-boot
-  (let ((version "0.16.1")
+  (let ((version "0.17")
         (revision "0")
-        (commit "6a48f4a81431d4357057ff928a7df880e3f3e6b4"))
+        (commit #f))
     (package-with-bootstrap-guile
      (package
        (name "mes-boot")
-       (version (string-append version "-" revision "." (string-take commit 
7)))
+       (version (if commit (string-append version "-" revision "." 
(string-take commit 7))
+                    version))
        (synopsis "Scheme interpreter and C compiler for full source 
bootstrapping")
-       (source (origin
-                 (method url-fetch)
-                 (uri (string-append "https://gitlab.com/janneke/mes";
-                                     "/-/archive/" commit
-                                     "/mes-" commit ".tar.gz"))
-                 (sha256
-                  (base32
-                   "1d1sfp54j8wsvv10mlsr4bh3n7fb70hhb164kldsrrixw6sk0nvi"))))
+       (source (if commit
+                   (origin
+                     (method url-fetch)
+                     (uri (string-append "https://gitlab.com/janneke/mes";
+                                         "/-/archive/" commit
+                                         "/mes-" commit ".tar.gz"))
+                     (sha256
+                      (base32
+                       
"02nakd20pnpgc1fq23r76ys23h150lg4fwjv5sqzza5dn66s60a6")))
+                   (origin
+                     (method url-fetch)
+                     (uri (string-append "http://alpha.gnu.org/gnu/mes/";
+                                         "mes-" version ".tar.gz"))
+                     (sha256
+                      (base32
+                       
"1j32x4zqy2cqjlg9m35f2411mwac2b0p5ch4hm99gddmfbxzgyhg")))))
        (build-system trivial-build-system)
        (supported-systems '("i686-linux" "x86_64-linux"))
        (native-inputs
@@ -279,8 +288,9 @@ hex2 linker.")
 
               ;; configure
               (setenv "prefix" out)
+              ;; (setenv "V" "2")
+              (system* "bash" "-x" "configure.sh")
 
-              ;; (setenv "BUILD_DEBUG" "1")
               (if ,%fake-bootstrap?
                   (begin     ; Cheat using Guile+Nyacc+MesCC; ~30 times faster
                     (setenv "MES" "guile")
@@ -293,8 +303,8 @@ hex2 linker.")
                                            ":" guile "/share/guile/2.0/"))
                     ;; these fail with guile-2.0
                     (when srfi-43
-                      (delete-file "tests/srfi-9.test-guile")
-                      (delete-file "tests/srfi-43.test-guile"))
+                      (delete-file "tests/srfi-9.test")
+                      (delete-file "tests/srfi-43.test"))
 
                     ;; give auto-compile a home -- massive speed-up
                     (mkdir-p "/tmp/home")
@@ -315,6 +325,7 @@ hex2 linker.")
 
                ;; check
                (unless ,%fake-bootstrap? ; check takes ~15min, skip when faking
+                 (setenv "MES_ARENA" "100000000")
                  (zero? (system* "sh" "build-aux/test.sh"))
                  (zero? (system* "sh" "build-aux/test.sh" 
"scaffold/tests/63-struct-cell"))
                  (zero? (system* "sh" "check.sh")))
@@ -323,12 +334,12 @@ hex2 linker.")
                (setenv "SHELL" (string-append coreutils "/bin/bash"))
                (zero? (system* "sh" "install.sh")))))))
        (description
-        "Mes [Maxwell Equations of Software] aims to create full source
+        "GNU 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.") ; []
-      (home-page "https://gitlab.com/janneke/mes";)
-      (license gpl3+)))))
+[Guile] Scheme.")
+       (home-page "https://gnu.org/software/mes";)
+       (license gpl3+)))))
 
 (define-public nyacc-boot
   (let ((version "0.80.42")

Reply via email to