ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guix: Switch to Guile-GnuTLS.

Browse source 
This is a followup to a1cd93083b.

* gnu/packages/package-management.scm (guix)[arguments]: Refer to
"guile-gnutls" instead of "gnutls".
[native-inputs, propagated-inputs]: Replace 'gnutls' with 'guile-gnutls'.
[inputs]: Add 'zlib'.
(guix-daemon): Replace 'gnutls' with 'guile-gnutls'.
(guix-build-coordinator)[arguments, propagated-inputs, native-inputs]:
Replace 'gnutls' with 'guile-gnutls'.
(guix-build-coordinator/agent-only): Likewise.
(nar-herder): Likewise.
This commit is contained in:
Ludovic Courtès 2022-10-18 10:21:11 +02:00
parent 69ed946bbc
commit 7c60e8f808
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -350,7 +350,7 @@ (define code
(bs (assoc-ref inputs (bs (assoc-ref inputs
"guile-bytestructures")) "guile-bytestructures"))
(ssh (assoc-ref inputs "guile-ssh")) (ssh (assoc-ref inputs "guile-ssh"))
(gnutls (assoc-ref inputs "gnutls")) (gnutls (assoc-ref inputs "guile-gnutls"))
(disarchive (assoc-ref inputs "disarchive")) (disarchive (assoc-ref inputs "disarchive"))
(lzma (assoc-ref inputs "guile-lzma")) (lzma (assoc-ref inputs "guile-lzma"))
(locales (assoc-ref inputs "glibc-utf8-locales")) (locales (assoc-ref inputs "glibc-utf8-locales"))
@ -406,7 +406,7 @@ (define code
;; Guile libraries are needed here for ;; Guile libraries are needed here for
;; cross-compilation. ;; cross-compilation.
("guile" ,guile-3.0-latest) ;for faster builds ("guile" ,guile-3.0-latest) ;for faster builds
("gnutls" ,gnutls) ("guile-gnutls" ,guile-gnutls)
,@(if (%current-target-system) ,@(if (%current-target-system)
'() '()
`(("guile-avahi" ,guile-avahi))) `(("guile-avahi" ,guile-avahi)))
@ -435,6 +435,7 @@ (define code
("gzip" ,gzip) ("gzip" ,gzip)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("zlib" ,zlib)
("guile" ,guile-3.0-latest) ("guile" ,guile-3.0-latest)
@ -463,7 +464,7 @@ (define code
("glibc-utf8-locales" ,glibc-utf8-locales))) ("glibc-utf8-locales" ,glibc-utf8-locales)))
(propagated-inputs (propagated-inputs
`(("gnutls" ,gnutls) `(("guile-gnutls" ,guile-gnutls)
;; Avahi requires "glib" which doesn't cross-compile yet. ;; Avahi requires "glib" which doesn't cross-compile yet.
,@(if (%current-target-system) ,@(if (%current-target-system)
'() '()
@ -550,7 +551,7 @@ (define-public guix-daemon
(inputs (inputs
(modify-inputs (package-inputs guix) (modify-inputs (package-inputs guix)
(delete "boot-guile" "boot-guile/i686" "util-linux") (delete "boot-guile" "boot-guile/i686" "util-linux")
(prepend gnutls guile-git guile-json-3 guile-gcrypt))) (prepend guile-gnutls guile-git guile-json-3 guile-gcrypt)))
(propagated-inputs '()) (propagated-inputs '())
@ -1414,7 +1415,7 @@ (define-public guix-build-coordinator
"guile-lzlib" "guile-lzlib"
"guile-zlib" "guile-zlib"
"guile-sqlite3" "guile-sqlite3"
"gnutls" "guile-gnutls"
,@(if (hurd-target?) ,@(if (hurd-target?)
'() '()
'("guile-fibers"))))) '("guile-fibers")))))
@ -1458,7 +1459,7 @@ (define-public guix-build-coordinator
(list pkg-config (list pkg-config
autoconf autoconf
automake automake
gnutls guile-gnutls
;; Guile libraries are needed here for cross-compilation. ;; Guile libraries are needed here for cross-compilation.
guile-json-4 guile-json-4
@ -1486,7 +1487,7 @@ (define-public guix-build-coordinator
guile-zlib guile-zlib
guile-sqlite3 guile-sqlite3
guix guix
gnutls) guile-gnutls)
(if (hurd-target?) (if (hurd-target?)
'() '()
(list guile-fibers-1.1)))) (list guile-fibers-1.1))))
@ -1535,7 +1536,7 @@ (define-public guix-build-coordinator/agent-only
"guile-lzlib" "guile-lzlib"
"guile-zlib" "guile-zlib"
"guile-sqlite3" "guile-sqlite3"
"gnutls"))) "guile-gnutls")))
(wrap-program file (wrap-program file
`("PATH" ":" prefix (,bin)) `("PATH" ":" prefix (,bin))
`("GUILE_LOAD_PATH" ":" prefix `("GUILE_LOAD_PATH" ":" prefix
@ -1563,7 +1564,7 @@ (define-public guix-build-coordinator/agent-only
(list pkg-config (list pkg-config
autoconf autoconf
automake automake
gnutls guile-gnutls
;; Guile libraries are needed here for cross-compilation. ;; Guile libraries are needed here for cross-compilation.
guile-json-4 guile-json-4
@ -1584,7 +1585,7 @@ (define-public guix-build-coordinator/agent-only
guile-lzlib guile-lzlib
guile-zlib guile-zlib
guix guix
gnutls))) guile-gnutls)))
(description (description
"The Guix Build Coordinator helps with performing lots of builds across "The Guix Build Coordinator helps with performing lots of builds across
potentially many machines, and with doing something with the results and potentially many machines, and with doing something with the results and
@ -1721,7 +1722,7 @@ (define-public nar-herder
"guile-lzlib" "guile-lzlib"
"guile-prometheus" "guile-prometheus"
"guile-sqlite3" "guile-sqlite3"
"gnutls" "guile-gnutls"
"guile-fibers"))) "guile-fibers")))
(wrap-program file (wrap-program file
`("GUILE_LOAD_PATH" ":" prefix `("GUILE_LOAD_PATH" ":" prefix
@ -1748,7 +1749,7 @@ (define-public nar-herder
(list pkg-config (list pkg-config
autoconf autoconf
automake automake
gnutls guile-gnutls
;; Guile libraries are needed here for cross-compilation. ;; Guile libraries are needed here for cross-compilation.
(car (assoc-ref (package-native-inputs guix) "guile")) (car (assoc-ref (package-native-inputs guix) "guile"))
@ -1772,7 +1773,7 @@ (define-public nar-herder
guile-lib guile-lib
guile-lzlib guile-lzlib
guile-sqlite3 guile-sqlite3
gnutls)) guile-gnutls))
(home-page "https://git.cbaines.net/guix/nar-herder") (home-page "https://git.cbaines.net/guix/nar-herder")
(synopsis "Utility for managing and serving nars") (synopsis "Utility for managing and serving nars")
(description (description