[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/70: bootstrap: Add %bootstrap-guile+guild.
From: |
guix-commits |
Subject: |
15/70: bootstrap: Add %bootstrap-guile+guild. |
Date: |
Sun, 15 Dec 2019 08:36:41 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit c1b0c3010207277359d317f5bfda8307b8bb66ca
Author: Jan Nieuwenhuizen <address@hidden>
Date: Mon Dec 2 19:11:23 2019 +0100
bootstrap: Add %bootstrap-guile+guild.
* gnu/packages/commencement.scm (%bootstrap-guile+guild): New variable.
---
gnu/packages/commencement.scm | 51 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 8bf7704..7f454c7 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -84,6 +84,57 @@
;;;
;;; Code:
+(define %bootstrap-guile+guild
+ ;; This package combines %bootstrap-guile with guild, which is not included
+ ;; in %bootstrap-guile. Guild is needed to build gash-boot and
+ ;; gash-core-utils-boot because it is dependency of the Guile build system.
+ (package
+ (name "guile-bootstrap+guild")
+ (version "2.0")
+ (source (bootstrap-origin (package-source guile-2.0)))
+ (native-inputs `(("bash" ,(bootstrap-executable "bash" (%current-system)))
+ ("tar" ,(bootstrap-executable "tar" (%current-system)))
+ ("xz" ,(bootstrap-executable "xz" (%current-system)))
+ ("guile" ,%bootstrap-guile)))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:guile ,%bootstrap-guile
+ #:modules ((guix build utils))
+ #:builder (begin
+ (use-modules (guix build utils))
+ (let ((guile-source (assoc-ref %build-inputs "source"))
+ (bin (string-append (getcwd) "/bin"))
+ (tar (assoc-ref %build-inputs "tar"))
+ (xz (assoc-ref %build-inputs "xz")))
+ (mkdir-p bin)
+ (setenv "PATH" bin)
+ (with-directory-excursion bin
+ (copy-file tar "tar")
+ (copy-file xz "xz")
+ (setenv "PATH" bin))
+ (let* ((out (assoc-ref %outputs "out"))
+ (out-bin (string-append out "/bin"))
+ (guile (assoc-ref %build-inputs "guile"))
+ (bash (assoc-ref %build-inputs "bash")))
+ (mkdir-p out-bin)
+ (with-directory-excursion out-bin
+ (symlink (string-append guile "/bin/guile")
+ "guile")
+ (invoke "tar" "--strip-components=2"
+ "-xvf" guile-source
+ (string-append "guile-"
+ ,(package-version guile-2.0)
+ "/meta/guild.in"))
+ (copy-file "guild.in" "guild")
+ (substitute* "guild"
+ (("#!/bin/sh") (string-append "#! " bash))
+ (("@installed_guile@") (string-append out-bin
"/guile")))
+ (chmod "guild" #o555)))))))
+ (synopsis "Bootstrap Guile plus Guild")
+ (description "Bootstrap Guile with added Guild")
+ (home-page #f)
+ (license (package-license guile-2.0))))
+
(define mes-boot
(package
(inherit mes)
- 08/70: bootstrap: bootstrap-mescc-tools: Update to mescc-tools-0.6.1., (continued)
- 08/70: bootstrap: bootstrap-mescc-tools: Update to mescc-tools-0.6.1., guix-commits, 2019/12/15
- 09/70: bootstrap: bootstrap-mes: Update to mes-0.21., guix-commits, 2019/12/15
- 13/70: Revert "bootstrap: mescc-tools-static: Update to 0.6.1.", guix-commits, 2019/12/15
- 10/70: Revert "bootstrap: bootstrap-mes: Update to mes-0.21.", guix-commits, 2019/12/15
- 07/70: gnu: Remove mescc-tools-0.5.2., guix-commits, 2019/12/15
- 11/70: Revert "bootstrap: bootstrap-mescc-tools: Update to mescc-tools-0.6.1.", guix-commits, 2019/12/15
- 14/70: Revert "bootstrap: mes-minimal: Update to mes-0.21.", guix-commits, 2019/12/15
- 12/70: Revert "gnu: Remove mescc-tools-0.5.2.", guix-commits, 2019/12/15
- 18/70: bootstrap: Add %bootstrap-mes-rewired., guix-commits, 2019/12/15
- 17/70: bootstrap: Add gash-core-utils-boot., guix-commits, 2019/12/15
- 15/70: bootstrap: Add %bootstrap-guile+guild.,
guix-commits <=
- 23/70: bootstrap: Add bzip2-mesboot., guix-commits, 2019/12/15
- 22/70: bootstrap: make-mesboot0: Use Gash instead of coreutils&co., guix-commits, 2019/12/15
- 20/70: bootstrap: tcc-boot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/15
- 26/70: bootstrap: diffuils-mesboot: Use Gash instead of coretutils&co., guix-commits, 2019/12/15
- 27/70: bootstrap: Add patch-mesboot., guix-commits, 2019/12/15
- 21/70: bootstrap: Add gzip-mesboot., guix-commits, 2019/12/15
- 24/70: bootstrap: Add bash-mesboot0., guix-commits, 2019/12/15
- 28/70: bootstrap: Add sed-mesboot0., guix-commits, 2019/12/15
- 32/70: bootstrap: mesboot-headers: Use Gash instead of coretutils&co., guix-commits, 2019/12/15
- 31/70: bootstrap: Add gawk-mesboot0., guix-commits, 2019/12/15