[PATCH] gnu: libolm: Unbundle unused blob.

DoneSubmitted by Maxime Devos.
Details
2 participants
  • Maxim Cournoyer
  • Maxime Devos
Owner
unassigned
Severity
normal
M
M
Maxime Devos wrote on 9 Jul 20:44 +0200
(address . guix-patches@gnu.org)(name . slg)(address . 0x2d@disroot.org)
846621f26464358f595a8df895c68f9ee7e61175.camel@telenet.be
Hi guix,
In the context of https://issues.guix.gnu.org/49123,I'm improving the package definitions of some dependenciesof 'mirage'.
The git repo of libolm bundles a compiled (!) version of gradle.libolm doesn't have a Java input, so it cannot be used accidentallyin Guix, but remove it anyways to be really sure.
This causes only two rebuilds, which succeeded on x86_64-linux.
Greetings,Maxime.
From 686302198208997c170b590b69c2a38a119b55c9 Mon Sep 17 00:00:00 2001From: Maxime Devos <maximedevos@telenet.be>Date: Fri, 9 Jul 2021 19:58:42 +0200Subject: [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 accidentallyin 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(-)
Toggle diff (19 lines)diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scmindex 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
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYOiZJhccbWF4aW1lZGV2b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7netAP9SZCFrttUEg//FvtNAXBBysjOYR3IT6SHjNvKA8UA6EQD/RLolmDhJrtY2q218+bJ/rOryd7R9lfM5GDFmwDScegc==28Nn-----END PGP SIGNATURE-----

M
M
Maxim Cournoyer wrote on 16 Jul 03:44 +0200
(name . Maxime Devos)(address . maximedevos@telenet.be)
875yxbnibp.fsf@gmail.com
Hello,
Maxime Devos <maximedevos@telenet.be> writes:
Toggle quote (32 lines)>> 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 usedhere and the import was missing, leading to:
ice-9/eval.scm:293:34: error: gexp: unbound variablehint: Did you forget `(use-modules (guix gexp))'?
Applied as commit dd98685356.
Thank you!
Maxim
Closed
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send email to 49497@debbugs.gnu.org