GNU bug report logs -
#49497
[PATCH] gnu: libolm: Unbundle unused blob.
Previous Next
Reported by: Maxime Devos <maximedevos <at> telenet.be>
Date: Fri, 9 Jul 2021 18:46:01 UTC
Severity: normal
Tags: patch
Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49497 in the body.
You can then email your comments to 49497 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#49497
; Package
guix-patches
.
(Fri, 09 Jul 2021 18:46:01 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Maxime Devos <maximedevos <at> telenet.be>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Fri, 09 Jul 2021 18:46:01 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
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.
[0001-gnu-libolm-Unbundle-unused-blob.patch (text/x-patch, inline)]
From 686302198208997c170b590b69c2a38a119b55c9 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos <at> 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
[signature.asc (application/pgp-signature, inline)]
Reply sent
to
Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
:
You have taken responsibility.
(Fri, 16 Jul 2021 01:45:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Maxime Devos <maximedevos <at> telenet.be>
:
bug acknowledged by developer.
(Fri, 16 Jul 2021 01:45:02 GMT)
Full text and
rfc822 format available.
Message #10 received at 49497-done <at> debbugs.gnu.org (full text, mbox):
Hello,
Maxime Devos <maximedevos <at> telenet.be> writes:
>
> From 686302198208997c170b590b69c2a38a119b55c9 Mon Sep 17 00:00:00 2001
> From: Maxime Devos <maximedevos <at> 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
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Fri, 13 Aug 2021 11:24:10 GMT)
Full text and
rfc822 format available.
This bug report was last modified 2 years and 229 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.