[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/16: commencement: built mes-boot1!
From: |
guix-commits |
Subject: |
16/16: commencement: built mes-boot1! |
Date: |
Fri, 30 Nov 2018 13:21:52 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit c9e273f5511616c14ba4a77393fdda23fd3cf7ed
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Nov 30 19:19:39 2018 +0100
commencement: built mes-boot1!
---
gnu/packages/commencement.scm | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index b129cba..b76d3ea 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -376,17 +376,26 @@
(invoke "src/mes" "--help")))
(replace 'install
(lambda _
+ ;; FIXME: [ is broken in gash
+ (substitute* "install.sh"
+ (("if \\[ (-f [^]]*)\\]" all test) (string-append "if test "
test))
+ (("if \\[ -z \"\\$srcdest\" \\]") "if test 0 = 0")
+ (("if \\[.*then") "if false; then"))
+
+ (substitute* "install.sh"
+ ;; FIXME: add --exclude to gash tar
+ ((" --exclude=[^ ]*") ""))
+
+ ;; show some progress
+ (substitute* "install.sh"
+ ((" -xf") " -xvf"))
+
;; show some progress
(substitute* "install.sh"
- ;;(("set -o pipefail" all) (string-append "#" all "\n"))
- (("if \\[ (-f [^\\]]*)\\]" all test) (string-append "if test "
test))
- (("if \\[.*then") "if false; then")
(("^( *)((cp|mkdir|tar) [^']*[^\\])\n" all space cmd)
(string-append space "echo '" cmd "'\n"
space cmd "\n")))
- (invoke "sh" "-x" "install.sh")
- ;;(throw 'barf)
- )))))
+ (invoke "sh" "-x" "install.sh"))))))
(native-search-paths
;; Use the language-specific variables rather than 'CPATH' because they
;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'.
- branch wip-bootstrap created (now c9e273f), guix-commits, 2018/11/30
- 11/16: mes-boot1: build with gash, guix-commits, 2018/11/30
- 02/16: bootstrap: Use x86_64-linux bootstrap tarballs for x86_64-linux., guix-commits, 2018/11/30
- 05/16: bootstrap: mes-minimal: Update for 0.19, guix-commits, 2018/11/30
- 08/16: bootstrap: Update %bootstrap-guile to 2.2., guix-commits, 2018/11/30
- 12/16: pieton: HAK, guix-commits, 2018/11/30
- 14/16: commencement: WIP, guix-commits, 2018/11/30
- 16/16: commencement: built mes-boot1!,
guix-commits <=
- 01/16: bootstrap: mes-boot: Use mes-boot0 version., guix-commits, 2018/11/30
- 09/16: bootstrap: Add %bootstrap-gash. WIP, guix-commits, 2018/11/30
- 10/16: bootstrap: Add make-mesboot1. WIP, guix-commits, 2018/11/30
- 06/16: gnu: Add gash., guix-commits, 2018/11/30
- 04/16: boot, guix-commits, 2018/11/30
- 03/16: mes: Update to 0.19. WIP, guix-commits, 2018/11/30
- 07/16: bootstrap: Add %gash-bootstrap-guile, %gash-bootstrap-guile-tarball., guix-commits, 2018/11/30
- 15/16: commencement: first installed mes-boot1 --still fu, guix-commits, 2018/11/30
- 13/16: mes-boot1: WIP -- works with subst, guix-commits, 2018/11/30