[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: guix-build-coordinator: Update to 0-19.f9a25
From: |
guix-commits |
Subject: |
branch master updated: gnu: guix-build-coordinator: Update to 0-19.f9a257e. |
Date: |
Tue, 23 Feb 2021 15:24:50 -0500 |
This is an automated email from the git hooks/post-receive script.
cbaines pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new eec1278 gnu: guix-build-coordinator: Update to 0-19.f9a257e.
eec1278 is described below
commit eec127822a74c6a1a6100b07d94c8fb275d571bf
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Tue Feb 23 20:19:16 2021 +0000
gnu: guix-build-coordinator: Update to 0-19.f9a257e.
* gnu/packages/package-management.scm (guix-build-coordinator): Update to
0-19.f9a257e.
---
gnu/packages/package-management.scm | 64 +++++++++++++++++++++++++++----------
1 file changed, 48 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index 9fb8c40..9c0f649 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1046,8 +1046,8 @@ environments.")
(license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-build-coordinator
- (let ((commit "88fbb69264a412ca2c7e6c4de024414444bd2df8")
- (revision "18"))
+ (let ((commit "f9a257ed61531eafc9727faebe50be1a1cb1648a")
+ (revision "19"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@@ -1058,7 +1058,7 @@ environments.")
(commit commit)))
(sha256
(base32
- "0bjf9bibamyk1d762w4nv0n0a7azww5bks2c9627zpzs2zqwqyiv"))
+ "1n9c5yn0crcqrrxng4xw1m2kvb9lin2fpym8ja75q6z3s7lpnjvg"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@@ -1075,7 +1075,7 @@ environments.")
(setenv "GUILE_AUTO_COMPILE" "0")
#t))
(add-after 'install 'wrap-executable
- (lambda* (#:key inputs outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs target #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(guile (assoc-ref inputs "guile"))
@@ -1085,18 +1085,47 @@ environments.")
(for-each
(lambda (file)
(simple-format (current-error-port) "wrapping: ~A\n" file)
- (wrap-program file
- `("PATH" ":" prefix
- (,bin
- ;; Support building without sqitch as an input, as it
- ;; can't be cross-compiled yet
- ,@(or (and=> (assoc-ref inputs "sqitch")
- list)
- '())))
- `("GUILE_LOAD_PATH" ":" prefix
- (,scm ,(getenv "GUILE_LOAD_PATH")))
- `("GUILE_LOAD_COMPILED_PATH" ":" prefix
- (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))
+ (let ((guile-inputs `("guile-json"
+ "guile-gcrypt"
+ "guix"
+ "guile-prometheus"
+ "guile-lib"
+ "guile-lzlib"
+ "guile-zlib"
+ "gnutls")))
+ (wrap-program file
+ `("PATH" ":" prefix
+ (,bin
+ ;; Support building without sqitch as an input, as
it
+ ;; can't be cross-compiled yet
+ ,@(or (and=> (assoc-ref inputs "sqitch")
+ list)
+ '())))
+ `("GUILE_LOAD_PATH" ":" prefix
+ (,scm ,(string-join
+ (map (lambda (input)
+ (simple-format
+ #f "~A/share/guile/site/~A"
+ (assoc-ref inputs input)
+ version))
+ guile-inputs)
+ ":")))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+ (,go ,(string-join
+ (map (lambda (input)
+ (simple-format
+ #f "~A/lib/guile/~A/site-ccache"
+ (assoc-ref inputs input)
+ version))
+ guile-inputs)
+ ":"))))
+ (when target
+ ;; XXX work around wrap-program picking bash for the
+ ;; host rather than target
+ (let ((bash (assoc-ref inputs "bash")))
+ (substitute* file
+ (("^#!.*/bash")
+ (string-append "#! " bash "/bin/bash")))))))
(find-files bin)))
#t))
(delete 'strip)))) ; As the .go files aren't compatible
@@ -1116,6 +1145,9 @@ environments.")
("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))))
(inputs
`(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
+ ,@(if (%current-target-system)
+ `(("bash" ,bash-minimal))
+ '())
("sqlite" ,sqlite)
,@(if (hurd-target?)
'()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: guix-build-coordinator: Update to 0-19.f9a257e.,
guix-commits <=