From: "Ludovic Courtès" <ludo@gnu.org>
To: 61790@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>, andreas@enge.fr
Subject: [bug#61790] [PATCH core-updates 2/5] gnu: gnutls: Remove Guile dependency.
Date: Sat, 25 Feb 2023 20:00:27 +0100 [thread overview]
Message-ID: <20230225190030.5289-2-ludo@gnu.org> (raw)
In-Reply-To: <20230225190030.5289-1-ludo@gnu.org>
* 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.
---
gnu/packages/tls.scm | 42 +++++++++++++-----------------------------
1 file changed, 13 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 9b2669e095..7a85cfe5bc 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -1,5 +1,5 @@
;;; 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 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
@@ -232,15 +232,6 @@ (define-public gnutls
;; independently. This seems suboptimal.
"--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)
(%current-system))))
(if (string-prefix? "mips64el" system)
@@ -276,17 +267,13 @@ (define-public gnutls
(native-inputs
(append (list pkg-config texinfo which
util-linux) ;one test needs 'setsid'
- (if (%current-target-system) ;for cross-build
- (list guile-3.0) ;to create .go files
- '())
(if (hurd-target?)
'()
(list net-tools
iproute ;for 'ss'
socat ;several tests rely on it
datefudge)))) ;tests rely on 'datefudge'
- (inputs
- (list guile-3.0))
+ (inputs (list libunistring))
(propagated-inputs
;; These are all in the 'Requires.private' field of gnutls.pc.
(append (list libtasn1 libidn2 nettle zlib)
@@ -319,14 +306,7 @@ (define-public gnutls-latest
"gnutls-cross.patch"))
(sha256
(base32
- "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")))))
+ "01i1gl15k6qwvxmxx0by1mn9nlmcmym18wdpm7dn9awfsp8474dy"))))))
(define-public gnutls/dane
;; GnuTLS with build libgnutls-dane, implementing DNS-based
@@ -338,12 +318,6 @@ (define-public gnutls/dane
(inputs (modify-inputs (package-inputs gnutls)
(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
(package
;; 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.")
(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)
"Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling
OpenSSL for TARGET."
--
2.39.1
next prev parent reply other threads:[~2023-02-25 19:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-25 18:55 [bug#61790] [PATCH core-updates 0/5] Package cleanups: Guile, GnuTLS, ncurses Ludovic Courtès
2023-02-25 19:00 ` [bug#61790] [PATCH core-updates 1/5] gnu: guile: Remove input labels Ludovic Courtès
2023-02-25 19:00 ` Ludovic Courtès [this message]
2023-02-25 19:00 ` [bug#61790] [PATCH core-updates 3/5] gnu: gnutls: Deprecate 'gnutls-latest' Ludovic Courtès
2023-02-25 19:00 ` [bug#61790] [PATCH core-updates 4/5] gnu: gettext: Remove input label Ludovic Courtès
2023-02-25 19:00 ` [bug#61790] [PATCH core-updates 5/5] gnu: ncurses: Rewrite using gexps Ludovic Courtès
2023-02-25 22:14 ` [bug#61790] [PATCH core-updates 0/5] Package cleanups: Guile, GnuTLS, ncurses Ludovic Courtès
2023-02-26 12:29 ` Andreas Enge
2023-02-26 17:16 ` Ludovic Courtès
2023-02-26 17:25 ` Andreas Enge
2023-02-26 21:50 ` bug#61790: " Ludovic Courtès
2023-02-26 12:31 ` [bug#61790] " Andreas Enge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230225190030.5289-2-ludo@gnu.org \
--to=ludo@gnu.org \
--cc=61790@debbugs.gnu.org \
--cc=andreas@enge.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.