* [bug#63388] [PATCH] gnu: guile-gnutls: Update to 3.7.12.
@ 2023-05-09 11:12 Christopher Baines
2023-05-09 22:32 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Christopher Baines @ 2023-05-09 11:12 UTC (permalink / raw)
To: 63388
* gnu/packages/tls.scm (guile-gnutls): Update to 3.7.12.
[source]: Switch to a tarball, to avoid a circular dependency if guile-gnutls
is used in git-download.
[arguments]: Remove phase changes for building from Git.
[native-inputs]: Remove autoconf and automake as they're now unnecessary.
---
gnu/packages/tls.scm | 43 +++++++++++--------------------------------
1 file changed, 11 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 6d7cff41b0..095de98d21 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -319,18 +319,18 @@ (define-public guile-gnutls
;; This package supersedes the Guile bindings that came with GnuTLS until
;; version 3.7.8 included.
(name "guile-gnutls")
- (version "3.7.11")
+ (version "3.7.12")
(home-page "https://gitlab.com/gnutls/guile/")
(source (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit (string-append "v" version))))
+ (method url-fetch)
+ (uri
+ (string-append
+ "https://gitlab.com/gnutls/guile/uploads/"
+ "3fe12c208bdc6155c5116cf5eac7a2ad"
+ "/guile-gnutls-" version ".tar.gz"))
(sha256
(base32
- "06d7v3i0d9ayp7zqk1rsy4z0wfpq69n0r54f1xrppb9gn7q9iva6"))
- (file-name (git-file-name name version))
- (patches (search-patches "gnutls-cross.patch"))))
+ "0dp3zsbnwgb4q4p8n6i5vnlwq52v5hp8f5c44ngyag89fcaz2fjx"))))
(build-system gnu-build-system)
(arguments
(list
@@ -343,34 +343,13 @@ (define-public guile-gnutls
(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"))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-more-shebangs
- (lambda _
- (substitute* "autogen.sh"
- (("\\$gnulib_tool \\$gnulib_tool_options")
- "sh $gnulib_tool $gnulib_tool_options"))
- (substitute* "configure.ac"
- (("build-aux/git-version-gen")
- "sh build-aux/git-version-gen"))
- (for-each patch-shebang
- '("autopull.sh" "autogen.sh"))))
- (replace 'bootstrap
- (lambda _
- (invoke "bash" "./bootstrap" "--no-git"))))))
+ "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions"))))
(native-inputs
- (list autoconf
- automake
- libtool
+ (list libtool
pkg-config
texinfo
gnutls
- guile-3.0 ;XXX: 'guile-snarf' invokes the native 'cpp'
- (gnulib-checkout
- #:version "2022-12-06"
- #:commit "440b528b1d81dd31b2a2e4dde20d5c837c147811"
- #:hash (base32 "15mq43abbnkbamchc9lynrvrd5ql8qacgyx2ph4kkngxf1bz3pqy"))))
+ guile-3.0)) ;XXX: 'guile-snarf' invokes the native 'cpp'
(inputs
(list gnutls
guile-3.0))
base-commit: 649ce7b433171a47e8a2819b849bfa88c736d0e9
--
2.39.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#63388] [PATCH] gnu: guile-gnutls: Update to 3.7.12.
2023-05-09 11:12 [bug#63388] [PATCH] gnu: guile-gnutls: Update to 3.7.12 Christopher Baines
@ 2023-05-09 22:32 ` Ludovic Courtès
2023-05-10 10:45 ` bug#63388: " Christopher Baines
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2023-05-09 22:32 UTC (permalink / raw)
To: Christopher Baines; +Cc: Simon Josefsson, 63388
Hi Christopher,
Christopher Baines <mail@cbaines.net> skribis:
> * gnu/packages/tls.scm (guile-gnutls): Update to 3.7.12.
> [source]: Switch to a tarball, to avoid a circular dependency if guile-gnutls
> is used in git-download.
> [arguments]: Remove phase changes for building from Git.
> [native-inputs]: Remove autoconf and automake as they're now unnecessary.
Excellent! (Thanks, Simon!)
> (source (origin
> - (method git-fetch)
> - (uri (git-reference
> - (url home-page)
> - (commit (string-append "v" version))))
> + (method url-fetch)
Please add a comment stating why we’re using ‘url-fetch’, with a
reference to <https://issues.guix.gnu.org/63331>.
> + (uri
> + (string-append
Rather on the same line maybe? :-)
Thanks for working on it!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#63388: [PATCH] gnu: guile-gnutls: Update to 3.7.12.
2023-05-09 22:32 ` Ludovic Courtès
@ 2023-05-10 10:45 ` Christopher Baines
0 siblings, 0 replies; 3+ messages in thread
From: Christopher Baines @ 2023-05-10 10:45 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 63388-done
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
Ludovic Courtès <ludo@gnu.org> writes:
> Hi Christopher,
>
> Christopher Baines <mail@cbaines.net> skribis:
>
>> * gnu/packages/tls.scm (guile-gnutls): Update to 3.7.12.
>> [source]: Switch to a tarball, to avoid a circular dependency if guile-gnutls
>> is used in git-download.
>> [arguments]: Remove phase changes for building from Git.
>> [native-inputs]: Remove autoconf and automake as they're now unnecessary.
>
> Excellent! (Thanks, Simon!)
>
>> (source (origin
>> - (method git-fetch)
>> - (uri (git-reference
>> - (url home-page)
>> - (commit (string-append "v" version))))
>> + (method url-fetch)
>
> Please add a comment stating why we’re using ‘url-fetch’, with a
> reference to <https://issues.guix.gnu.org/63331>.
Done.
>> + (uri
>> + (string-append
>
> Rather on the same line maybe? :-)
Sure, I've moved it up.
> Thanks for working on it!
No problem, I've pushed this to master as
5e1e67442188ccca8db8c1dd092efbc6fc2c33dc.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-10 10:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-09 11:12 [bug#63388] [PATCH] gnu: guile-gnutls: Update to 3.7.12 Christopher Baines
2023-05-09 22:32 ` Ludovic Courtès
2023-05-10 10:45 ` bug#63388: " Christopher Baines
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.