mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-02 16:17:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guix-build-coordinator: Update to 0-19.f9a257e.

Browse source 
* gnu/packages/package-management.scm (guix-build-coordinator): Update to
0-19.f9a257e.
This commit is contained in:
Christopher Baines 2021-02-23 20:19:16 +00:00
parent 56733080c4
commit eec127822a
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 48 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
gnu/packages/package-management.scm
View file

@ -1046,8 +1046,8 @@ (define-public gwl
(license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-build-coordinator (define-public guix-build-coordinator
(let ((commit "88fbb69264a412ca2c7e6c4de024414444bd2df8") (let ((commit "f9a257ed61531eafc9727faebe50be1a1cb1648a")
(revision "18")) (revision "19"))
(package (package
(name "guix-build-coordinator") (name "guix-build-coordinator")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -1058,7 +1058,7 @@ (define-public guix-build-coordinator
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"0bjf9bibamyk1d762w4nv0n0a7azww5bks2c9627zpzs2zqwqyiv")) "1n9c5yn0crcqrrxng4xw1m2kvb9lin2fpym8ja75q6z3s7lpnjvg"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -1075,7 +1075,7 @@ (define-public guix-build-coordinator
(setenv "GUILE_AUTO_COMPILE" "0") (setenv "GUILE_AUTO_COMPILE" "0")
#t)) #t))
(add-after 'install 'wrap-executable (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")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(guile (assoc-ref inputs "guile")) (guile (assoc-ref inputs "guile"))
@ -1085,18 +1085,47 @@ (define-public guix-build-coordinator
(for-each (for-each
(lambda (file) (lambda (file)
(simple-format (current-error-port) "wrapping: ~A\n" file) (simple-format (current-error-port) "wrapping: ~A\n" file)
(wrap-program file (let ((guile-inputs `("guile-json"
`("PATH" ":" prefix "guile-gcrypt"
(,bin "guix"
;; Support building without sqitch as an input, as it "guile-prometheus"
;; can't be cross-compiled yet "guile-lib"
,@(or (and=> (assoc-ref inputs "sqitch") "guile-lzlib"
list) "guile-zlib"
'()))) "gnutls")))
`("GUILE_LOAD_PATH" ":" prefix (wrap-program file
(,scm ,(getenv "GUILE_LOAD_PATH"))) `("PATH" ":" prefix
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,bin
(,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))) ;; 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))) (find-files bin)))
#t)) #t))
(delete 'strip)))) ; As the .go files aren't compatible (delete 'strip)))) ; As the .go files aren't compatible
@ -1116,6 +1145,9 @@ (define-public guix-build-coordinator
("guile" ,@(assoc-ref (package-native-inputs guix) "guile")))) ("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))))
(inputs (inputs
`(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
,@(if (%current-target-system)
`(("bash" ,bash-minimal))
'())
("sqlite" ,sqlite) ("sqlite" ,sqlite)
,@(if (hurd-target?) ,@(if (hurd-target?)
'() '()