ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gnutls: Remove Guile dependency.

Browse source 
* gnu/packages/tls.scm (gnutls)[arguments]: Remove --with-guile-*
configure flags.
[native-inputs]: Remove GUILE-3.0.
[inputs]: Likewise, and add LIBUNISTRING.
(gnutls-latest)[inputs, native-inputs]: Remove.
(guile2.2-gnutls): Rewrite as a variant of GUILE-GNUTLS.
This commit is contained in:
Ludovic Courtès 2023-02-25 19:39:39 +01:00
parent d427ec4038
commit 305794762c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
gnu/packages/tls.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012-2017, 2019-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012-2017, 2019-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
@ -232,15 +232,6 @@ (define-public gnutls
;; independently. This seems suboptimal. ;; independently. This seems suboptimal.
"--with-default-trust-store-dir=/etc/ssl/certs" "--with-default-trust-store-dir=/etc/ssl/certs"
;; Tell the build system that we want Guile bindings installed to
;; the output instead of Guiles own module directory.
(string-append "--with-guile-site-dir="
"$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)")
(string-append "--with-guile-site-ccache-dir="
"$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache")
(string-append "--with-guile-extension-dir="
"$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions")
(let ((system #$(or (%current-target-system) (let ((system #$(or (%current-target-system)
(%current-system)))) (%current-system))))
(if (string-prefix? "mips64el" system) (if (string-prefix? "mips64el" system)
@ -276,17 +267,13 @@ (define-public gnutls
(native-inputs (native-inputs
(append (list pkg-config texinfo which (append (list pkg-config texinfo which
util-linux) ;one test needs 'setsid' util-linux) ;one test needs 'setsid'
(if (%current-target-system) ;for cross-build
(list guile-3.0) ;to create .go files
'())
(if (hurd-target?) (if (hurd-target?)
'() '()
(list net-tools (list net-tools
iproute ;for 'ss' iproute ;for 'ss'
socat ;several tests rely on it socat ;several tests rely on it
datefudge)))) ;tests rely on 'datefudge' datefudge)))) ;tests rely on 'datefudge'
(inputs (inputs (list libunistring))
(list guile-3.0))
(propagated-inputs (propagated-inputs
;; These are all in the 'Requires.private' field of gnutls.pc. ;; These are all in the 'Requires.private' field of gnutls.pc.
(append (list libtasn1 libidn2 nettle zlib) (append (list libtasn1 libidn2 nettle zlib)
@ -319,14 +306,7 @@ (define-public gnutls-latest
"gnutls-cross.patch")) "gnutls-cross.patch"))
(sha256 (sha256
(base32 (base32
"01i1gl15k6qwvxmxx0by1mn9nlmcmym18wdpm7dn9awfsp8474dy")))) "01i1gl15k6qwvxmxx0by1mn9nlmcmym18wdpm7dn9awfsp8474dy"))))))
;; Disable Guile bindings: they are now provided by Guile-GnuTLS.
(inputs (modify-inputs (package-inputs gnutls)
(delete "guile")
(append libunistring))) ;GnuTLS depends on it
(native-inputs (modify-inputs (package-native-inputs gnutls)
(delete "guile")))))
(define-public gnutls/dane (define-public gnutls/dane
;; GnuTLS with build libgnutls-dane, implementing DNS-based ;; GnuTLS with build libgnutls-dane, implementing DNS-based
@ -338,12 +318,6 @@ (define-public gnutls/dane
(inputs (modify-inputs (package-inputs gnutls) (inputs (modify-inputs (package-inputs gnutls)
(prepend unbound))))) (prepend unbound)))))
(define-public guile2.2-gnutls
(package/inherit gnutls
(name "guile2.2-gnutls")
(inputs (modify-inputs (package-inputs gnutls)
(replace "guile" guile-2.2)))))
(define-public guile-gnutls (define-public guile-gnutls
(package (package
;; This package supersedes the Guile bindings that came with GnuTLS until ;; This package supersedes the Guile bindings that came with GnuTLS until
@ -407,6 +381,16 @@ (define-public guile-gnutls
bindings that were formerly provided as part of GnuTLS.") bindings that were formerly provided as part of GnuTLS.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public guile2.2-gnutls
(package/inherit guile-gnutls
(name "guile2.2-gnutls")
(native-inputs
(modify-inputs (package-native-inputs guile-gnutls)
(replace "guile" guile-2.2)))
(inputs
(modify-inputs (package-inputs guile-gnutls)
(replace "guile" guile-2.2)))))
(define (target->openssl-target target) (define (target->openssl-target target)
"Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling "Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling
OpenSSL for TARGET." OpenSSL for TARGET."