From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Maxime Devos <maximedevos@telenet.be>
Cc: 49497-done@debbugs.gnu.org, slg <0x2d@disroot.org>
Subject: bug#49497: [PATCH] gnu: libolm: Unbundle unused blob.
Date: Thu, 15 Jul 2021 21:44:26 -0400 [thread overview]
Message-ID: <875yxbnibp.fsf@gmail.com> (raw)
In-Reply-To: <846621f26464358f595a8df895c68f9ee7e61175.camel@telenet.be> (Maxime Devos's message of "Fri, 09 Jul 2021 20:44:53 +0200")
Hello,
Maxime Devos <maximedevos@telenet.be> writes:
>
> From 686302198208997c170b590b69c2a38a119b55c9 Mon Sep 17 00:00:00 2001
> From: Maxime Devos <maximedevos@telenet.be>
> Date: Fri, 9 Jul 2021 19:58:42 +0200
> Subject: [PATCH] gnu: libolm: Unbundle unused blob.
>
> The git repo of libolm bundles a compiled (!) version of gradle.
> libolm doesn't have a Java input, so it cannot be used accidentally
> in Guix, but remove it anyways to be really sure.
>
> * gnu/package/crypto.scm
> (libolm)[source][snippet]: Delete "gradle-wrapper.jar". It is a
> bundled compiled (!) version of gradle.
> ---
> gnu/packages/crypto.scm | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
> index bd2c462b96..f502da1af9 100644
> --- a/gnu/packages/crypto.scm
> +++ b/gnu/packages/crypto.scm
> @@ -1309,7 +1309,11 @@ Trusted comments are signed, thus verified, before being displayed.")
> (sha256
> (base32
> "0bixly6jqpwfx3p37c1qp1j685yg6m429r1nazwh43w4n527bs3y"))
> - (file-name (git-file-name name version))))
> + (file-name (git-file-name name version))
> + ;; Delete the bundled blob. It's free, but unauditable,
> + ;; and apparently only required for android.
> + (snippet #~(delete-file
> + "android/gradle/wrapper/gradle-wrapper.jar"))))
I replaced the gexp by a quote, as the extra G-Exp features are not used
here and the import was missing, leading to:
ice-9/eval.scm:293:34: error: gexp: unbound variable
hint: Did you forget `(use-modules (guix gexp))'?
Applied as commit dd98685356.
Thank you!
Maxim
prev parent reply other threads:[~2021-07-16 1:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-09 18:44 [bug#49497] [PATCH] gnu: libolm: Unbundle unused blob Maxime Devos
2021-07-16 1:44 ` Maxim Cournoyer [this message]
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=875yxbnibp.fsf@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=0x2d@disroot.org \
--cc=49497-done@debbugs.gnu.org \
--cc=maximedevos@telenet.be \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).