me/guix
Archived
1
0
Fork 0
Code Activity

gnu: guix-build-coordinator: Update to 0-86.f39f160.

Browse source 
* gnu/packages/package-management.scm (guix-build-coordinator): Update to
0-86.f39f160.
[arguments]: Update style.
This commit is contained in:
Christopher Baines 2023-07-26 10:49:07 +01:00
parent a62c8a80cb
commit 9312c68334
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 59 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1408,8 +1408,8 @@ environments.")
"0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))
(define-public guix-build-coordinator (define-public guix-build-coordinator
(let ((commit "c44d485bba42034804beb47afc23005c4e73ea96") (let ((commit "f39f16000469429745bd8aff3cd4d59b7c489fa1")
(revision "85")) (revision "86"))
(package (package
(name "guix-build-coordinator") (name "guix-build-coordinator")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -1420,75 +1420,74 @@ environments.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1y69yrmmifdp55l5c5b8iiq0llwpggxmq6a4233cdll3bhfxaicl")) "1lmbwbza87xzbvmzw44sgpscmqjfl5kpgfl79n7hzwa1icqqb7mg"))
(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
`(#:modules (((guix build guile-build-system) (list
#:modules `(((guix build guile-build-system)
#:select (target-guile-effective-version)) #:select (target-guile-effective-version))
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:imported-modules ((guix build guile-build-system) #:imported-modules `((guix build guile-build-system)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'build 'set-GUILE_AUTO_COMPILE (add-before 'build 'set-GUILE_AUTO_COMPILE
(lambda _ (lambda _
;; To avoid warnings relating to 'guild'. ;; To avoid warnings relating to 'guild'.
(setenv "GUILE_AUTO_COMPILE" "0") (setenv "GUILE_AUTO_COMPILE" "0")))
#t)) (add-after 'install 'wrap-executable
(add-after 'install 'wrap-executable (lambda* (#:key inputs outputs target #: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")) (version (target-guile-effective-version))
(version (target-guile-effective-version)) (scm (string-append out "/share/guile/site/" version))
(scm (string-append out "/share/guile/site/" version)) (go (string-append out "/lib/guile/" version "/site-ccache")))
(go (string-append out "/lib/guile/" version "/site-ccache"))) (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) (let ((guile-inputs (list
(let ((guile-inputs (list "guile-json"
"guile-json" "guile-gcrypt"
"guile-gcrypt" "guix"
"guix" "guile-prometheus"
"guile-prometheus" "guile-lib"
"guile-lib" "guile-lzlib"
"guile-lzlib" "guile-zlib"
"guile-zlib" "guile-sqlite3"
"guile-sqlite3" "guile-gnutls"
"guile-gnutls" #$@(if (target-hurd?)
,@(if (target-hurd?) '()
'() '("guile-fibers")))))
'("guile-fibers"))))) (wrap-program file
(wrap-program file `("PATH" ":" prefix
`("PATH" ":" prefix (,bin
(,bin ;; Support building without sqitch as an input, as it
;; Support building without sqitch as an input, as it ;; can't be cross-compiled yet
;; can't be cross-compiled yet ,@(or (and=> (assoc-ref inputs "sqitch")
,@(or (and=> (assoc-ref inputs "sqitch") list)
list) '())))
'()))) `("GUILE_LOAD_PATH" ":" prefix
`("GUILE_LOAD_PATH" ":" prefix (,scm ,(string-join
(,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) (map (lambda (input)
(simple-format (simple-format
#f "~A/share/guile/site/~A" #f "~A/lib/guile/~A/site-ccache"
(assoc-ref inputs input) (assoc-ref inputs input)
version)) version))
guile-inputs) guile-inputs)
":"))) ":"))))))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (find-files bin)))))
(,go ,(string-join (delete 'strip)))) ; As the .go files aren't compatible
(map (lambda (input)
(simple-format
#f "~A/lib/guile/~A/site-ccache"
(assoc-ref inputs input)
version))
guile-inputs)
":"))))))
(find-files bin)))
#t))
(delete 'strip)))) ; As the .go files aren't compatible
(native-inputs (native-inputs
(list pkg-config (list pkg-config
autoconf autoconf