guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

120/160: gnu: mes-boot: Update to 0.16.1; revise dependencies.


From: Jan Nieuwenhuizen
Subject: 120/160: gnu: mes-boot: Update to 0.16.1; revise dependencies.
Date: Tue, 28 Aug 2018 15:56:34 -0400 (EDT)

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

commit 0cc8fd30af5f56bd058802ee8d7374920ec8d67a
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Thu Jul 12 08:43:19 2018 +0200

    gnu: mes-boot: Update to 0.16.1; revise dependencies.
    
    * gnu/packages/mes.scm (mes-boot): Update to 0.16.1; revise dependencies.
---
 gnu/packages/mes.scm | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 403d02f..59f4e5a 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -223,9 +223,9 @@ hex2 linker.")
        (license gpl3+)))))
 
 (define-public mes-boot
-  (let ((version "0.16")
+  (let ((version "0.16.1")
         (revision "0")
-        (commit "f9a4e219727bedd504ea49885c3260c38755c1d0"))
+        (commit "6a48f4a81431d4357057ff928a7df880e3f3e6b4"))
     (package-with-bootstrap-guile
      (package
        (name "mes-boot")
@@ -238,14 +238,11 @@ hex2 linker.")
                                      "/mes-" commit ".tar.gz"))
                  (sha256
                   (base32
-                   "1rvk2drps0g0klljw190ljpfd28bfpw9iw2n6s3lrw6ch7x8jgpn"))))
+                   "1d1sfp54j8wsvv10mlsr4bh3n7fb70hhb164kldsrrixw6sk0nvi"))))
        (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)))
-          ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
-          ("xz"  ,(search-bootstrap-binary "xz" (%current-system)))
+        `(("coreutils" , %bootstrap-coreutils&co)
           ("mescc-tools" ,mescc-tools-boot)
           ("nyacc-source" ,(package-source nyacc-boot))
           ("mes-seed" ,%mes-seed)
@@ -258,12 +255,10 @@ hex2 linker.")
           #:builder
           (begin
             (use-modules (guix build utils))
-            (let* ((bash (assoc-ref %build-inputs "static-bash"))
+            (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
                    (guile (assoc-ref %build-inputs "guile"))
                    (srfi-43 (assoc-ref %build-inputs "srfi-43"))
                    (mescc-tools (assoc-ref %build-inputs "mescc-tools"))
-                   (tar (assoc-ref %build-inputs "tar"))
-                   (xz (assoc-ref %build-inputs "xz"))
                    (source (assoc-ref %build-inputs "source"))
                    (nyacc-source (assoc-ref %build-inputs "nyacc-source"))
                    (mes-seed (assoc-ref %build-inputs "mes-seed"))
@@ -272,11 +267,9 @@ hex2 linker.")
 
               ;; unpack
               (setenv "PATH" (string-append
-                              bash "/bin:"
-                              (if guile (string-append guile "/bin:") "")
-                              mescc-tools "/bin:"
-                              tar "/bin:"
-                              xz "/bin"))
+                              coreutils "/bin"
+                              (if guile (string-append ":" guile "/bin") "")
+                              ":" mescc-tools "/bin"))
               (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
               (mkdir-p "source")
               (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
@@ -290,7 +283,7 @@ hex2 linker.")
               (chdir "source")
 
               ;; configure
-              (setenv "PREFIX" out)
+              (setenv "prefix" out)
 
               ;; (setenv "BUILD_DEBUG" "1")
               (if ,%fake-bootstrap?
@@ -332,7 +325,7 @@ hex2 linker.")
                  (zero? (system* "sh" "check.sh")))
 
                ;; install
-               (setenv "SHELL" (string-append bash "/bin/bash"))
+               (setenv "SHELL" (string-append coreutils "/bin/bash"))
                (zero? (system* "sh" "install.sh")))))))
        (description
         "Mes [Maxwell Equations of Software] aims to create full source



reply via email to

[Prev in Thread] Current Thread [Next in Thread]