54/210: gnu: mescc-tools-boot: Update to 0.4.

[Jan Nieuwenhuizen]

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

commit a454431aa5e4eda8f2c78da4fbb1dfea3023ce6b
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Mon May 28 14:51:32 2018 +0200

    gnu: mescc-tools-boot: Update to 0.4.
    
    * gnu/packages/mes.scm (mescc-tools-boot): Update to 0.4.
---
 gnu/packages/mes.scm | 129 +++++++++++++++++++++++++--------------------------
 1 file changed, 64 insertions(+), 65 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index ffdd0ac..487aac1 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -153,73 +153,72 @@ with a Knight VM that runs Forth and Lisp.")
       (license gpl3+))))
 
 (define-public mescc-tools-boot
-  (let ((version "0.3")
-        (revision "0")
-        (commit "3102e7ca44ab12e2eb8567763c681123e79a3c35"))
-    (package-with-bootstrap-guile
-     (package
-       (name "mescc-tools-boot")
-       (version (string-append version "-" revision "." (string-take commit 
7)))
-       (synopsis "Tools for the full source bootstrapping process")
-       (source (origin
-                 (method url-fetch)
-                 (uri (string-append "https://gitlab.com/janneke/mescc-tools";
-                                     "/-/archive/" commit
-                                     "/mescc-tools-" commit ".tar.gz"))
-                 (sha256
-                  (base32
-                   "0i693znfc9lmjw9pp5appyhxnjdxsx11q7znqm6yzn98cr0zhnam"))))
-       (native-inputs
-        `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
-          ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
-          ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
-          ("xz"  ,(search-bootstrap-binary "xz" (%current-system)))
-          ("mescc-tools-seed" ,%mescc-tools-seed)
-          ("mes-source" ,(package-source mes-boot))
-          ("mes-seed" ,%mes-seed)))
-       (supported-systems '("i686-linux" "x86_64-linux"))
-       (build-system trivial-build-system)
-       (arguments
-        `(#:modules ((guix build utils))
-          #:builder
-          (begin
-            (use-modules (guix build utils))
-            (let* ((bash (assoc-ref %build-inputs "static-bash"))
-                   (tar (assoc-ref %build-inputs "tar"))
-                   (xz (assoc-ref %build-inputs "xz"))
-                   (source (assoc-ref %build-inputs "source"))
-                   (mescc-tools-seed (assoc-ref %build-inputs 
"mescc-tools-seed"))
-                   (mes-seed (assoc-ref %build-inputs "mes-seed"))
-                   (mes-source (assoc-ref %build-inputs "mes-source"))
-                   (out (assoc-ref %outputs "out"))
-                   (out/bin (string-append out "/bin")))
-              (setenv "PATH" (string-append bash "/bin:"
-                                            "../mescc-tools-seed:"
-                                            tar "/bin:"
-                                            xz "/bin"))
-              (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
-              (mkdir-p "source")
-              (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
-              (mkdir-p "mescc-tools-seed")
-              (system* "tar" "--strip=1" "-C" "mescc-tools-seed" "-xvf" 
mescc-tools-seed)
-              (mkdir-p "mes-source")
-              (system* "tar" "--strip=1" "-C" "mes-source" "-xvf" mes-source)
-              (mkdir-p "mes-seed")
-              (system* "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed)
-              (chdir "source")
-              (setenv "PREFIX" out)
-              (setenv "MES_PREFIX" "../mes-source")
-              (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed")
-              (setenv "MES_SEED" "../mes-seed")
-              (and (zero? (system* "sh" "build.sh"))
-                   (zero? (system* "sh" "check.sh"))
-                   (zero? (system* "sh" "install.sh")))))))
-       (description
-        "Mescc-tools is a collection of tools for use in a full source
+  (package-with-bootstrap-guile
+   (package
+     (name "mescc-tools-boot")
+     (version "0.4")
+     (synopsis "Tools for the full source bootstrapping process")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append
+                     "https://github.com/oriansj/mescc-tools/archive/Release_";
+                     version
+                     ".tar.gz"))
+               (file-name (string-append name "-" version ".tar.gz"))
+               (sha256
+                (base32
+                 "1iwc8xqwzdaqckb4jkkisljrgn8ii4bl7dzk1l2kpv98hsyq9vi1"))))
+     (native-inputs
+      `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
+        ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
+        ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
+        ("xz"  ,(search-bootstrap-binary "xz" (%current-system)))
+        ("mescc-tools-seed" ,%mescc-tools-seed)
+        ("mes-source" ,(package-source mes-boot))
+        ("mes-seed" ,%mes-seed)))
+     (supported-systems '("i686-linux" "x86_64-linux"))
+     (build-system trivial-build-system)
+     (arguments
+      `(#:modules ((guix build utils))
+        #:builder
+        (begin
+          (use-modules (guix build utils))
+          (let* ((bash (assoc-ref %build-inputs "static-bash"))
+                 (tar (assoc-ref %build-inputs "tar"))
+                 (xz (assoc-ref %build-inputs "xz"))
+                 (source (assoc-ref %build-inputs "source"))
+                 (mescc-tools-seed (assoc-ref %build-inputs 
"mescc-tools-seed"))
+                 (mes-seed (assoc-ref %build-inputs "mes-seed"))
+                 (mes-source (assoc-ref %build-inputs "mes-source"))
+                 (out (assoc-ref %outputs "out"))
+                 (out/bin (string-append out "/bin")))
+            (setenv "PATH" (string-append bash "/bin:"
+                                          "../mescc-tools-seed:"
+                                          tar "/bin:"
+                                          xz "/bin"))
+            (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
+            (mkdir-p "source")
+            (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
+            (mkdir-p "mescc-tools-seed")
+            (system* "tar" "--strip=1" "-C" "mescc-tools-seed" "-xvf" 
mescc-tools-seed)
+            (mkdir-p "mes-source")
+            (system* "tar" "--strip=1" "-C" "mes-source" "-xvf" mes-source)
+            (mkdir-p "mes-seed")
+            (system* "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed)
+            (chdir "source")
+            (setenv "PREFIX" out)
+            (setenv "MES_PREFIX" "../mes-source")
+            (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed")
+            (setenv "MES_SEED" "../mes-seed")
+            (and (zero? (system* "sh" "build.sh"))
+                 (zero? (system* "sh" "check.sh"))
+                 (zero? (system* "sh" "install.sh")))))))
+     (description
+      "Mescc-tools is a collection of tools for use in a full source
 bootstrapping process.  Currently consists of the M1 macro assembler and the
 hex2 linker.")
-       (home-page "https://github.com/oriansj/mescc-tools";)
-       (license gpl3+)))))
+     (home-page "https://github.com/oriansj/mescc-tools";)
+     (license gpl3+))))
 
 (define-public mes-boot
   (let ((version "0.14")