* [bug#49497] [PATCH] gnu: libolm: Unbundle unused blob.
@ 2021-07-09 18:44 Maxime Devos
2021-07-16 1:44 ` bug#49497: " Maxim Cournoyer
0 siblings, 1 reply; 2+ messages in thread
From: Maxime Devos @ 2021-07-09 18:44 UTC (permalink / raw)
To: 49497; +Cc: slg
[-- Attachment #1.1: Type: text/plain, Size: 420 bytes --]
Hi guix,
In the context of <https://issues.guix.gnu.org/49123>,
I'm improving the package definitions of some dependencies
of 'mirage'.
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.
This causes only two rebuilds, which succeeded on x86_64-linux.
Greetings,
Maxime.
[-- Attachment #1.2: 0001-gnu-libolm-Unbundle-unused-blob.patch --]
[-- Type: text/x-patch, Size: 1429 bytes --]
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"))))
(build-system cmake-build-system)
(arguments
`(#:phases
--
2.32.0
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#49497: [PATCH] gnu: libolm: Unbundle unused blob.
2021-07-09 18:44 [bug#49497] [PATCH] gnu: libolm: Unbundle unused blob Maxime Devos
@ 2021-07-16 1:44 ` Maxim Cournoyer
0 siblings, 0 replies; 2+ messages in thread
From: Maxim Cournoyer @ 2021-07-16 1:44 UTC (permalink / raw)
To: Maxime Devos; +Cc: 49497-done, slg
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-16 1:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-09 18:44 [bug#49497] [PATCH] gnu: libolm: Unbundle unused blob Maxime Devos
2021-07-16 1:44 ` bug#49497: " Maxim Cournoyer
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).