From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id Qb88GKnk8GAqYAEAgWs5BA (envelope-from ) for ; Fri, 16 Jul 2021 03:45:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id oAxKE6nk8GAgZQAAbx9fmQ (envelope-from ) for ; Fri, 16 Jul 2021 01:45:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B553218B62 for ; Fri, 16 Jul 2021 03:45:12 +0200 (CEST) Received: from localhost ([::1]:47124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4Cud-0005Z2-NF for larch@yhetil.org; Thu, 15 Jul 2021 21:45:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4CuV-0005Y4-Dx for guix-patches@gnu.org; Thu, 15 Jul 2021 21:45:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38591) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4CuU-0008E2-LG for guix-patches@gnu.org; Thu, 15 Jul 2021 21:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4CuU-00040W-Ke for guix-patches@gnu.org; Thu, 15 Jul 2021 21:45:02 -0400 Subject: bug#49497: [PATCH] gnu: libolm: Unbundle unused blob. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Fri, 16 Jul 2021 01:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 49497 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 49497-done@debbugs.gnu.org, slg <0x2d@disroot.org> Mail-Followup-To: 49497@debbugs.gnu.org, maxim.cournoyer@gmail.com, maximedevos@telenet.be Received: via spool by 49497-done@debbugs.gnu.org id=D49497.162639987715352 (code D ref 49497); Fri, 16 Jul 2021 01:45:02 +0000 Received: (at 49497-done) by debbugs.gnu.org; 16 Jul 2021 01:44:37 +0000 Received: from localhost ([127.0.0.1]:50135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4Cu5-0003zY-8G for submit@debbugs.gnu.org; Thu, 15 Jul 2021 21:44:37 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:35621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4Cu1-0003zJ-SN for 49497-done@debbugs.gnu.org; Thu, 15 Jul 2021 21:44:35 -0400 Received: by mail-qt1-f173.google.com with SMTP id g12so6023678qtb.2 for <49497-done@debbugs.gnu.org>; Thu, 15 Jul 2021 18:44:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=UX2XLBm0XbDgGuDBHgd9p8KIEfskT9zvkVfBwuutKBc=; b=e/KiQIy6WyQFaLS8Yxgh7MHJpbtcDVEeKKGJKgsIGF8/Z2oseSavsYnciPJbcPzpJ2 BT7c/CTTi2sXfSgWfgjIy5/+rDYmn+/XgI2saKJ1/fSRj0A8com3jkghgrqBDaMTt4XS 56V2+K5lkcXftTT6mWGOqMUEvNHq9WvgW7Up8pQJyt7Q7V/TpYw5oTj/hJ4BXC7fYNbh IYedEwyH5z5AXzlLtolP3N9yUioEBxIOuE1slB5WTFV84K8O/Z2WH0AMuoxQKGrFghQX tZUrxfhEbL/NkqRyH/D7Kt/EEGeXNmlSmwsLEYxc9QiMLfQXNPorX+m1X4jixd3wni0H TxDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=UX2XLBm0XbDgGuDBHgd9p8KIEfskT9zvkVfBwuutKBc=; b=M4Jji2twtzOtWHfiIR/4y5xzdkWrTBe3cxacjSJ2IJI0jr4jpF3fzv2uWW2HbGT3ei bH0cW43TCOIrcYc4gIeh+FwJH3fFv49N7pjf9SRRfKMHqDxQCuHrDjYiQJfYfrhjrayK 2jxfy9LT7Xo1AnbDPuG+njsvZR4LJVpCJWywrUlMqlIfoySxQ7VX9R781YX3MLQvD9Ab glTjYiMsYmK6TgnZkyHEVFt+0RVlwdir+Zf3qGOCphUwJ6O32mE7Wb4Cm8vOMtMal5da Pa/Hs5rsCZIbs16s0CSwQERerHqVYYHOq/dHyF8Oj8Or/D/7UurjeDbGkEvIfBFKRuMn wM8g== X-Gm-Message-State: AOAM532ygCWkEOMZCk5SxiqF27UApuad3VigwFpkBJEOfDBAj9yWDepA p0cNw2/Xd1b7iEx+/ATD2ME= X-Google-Smtp-Source: ABdhPJxKJx9EaV+sqt9KnJnUQYCO1JlbqoYdnuyveMEcJPL6PvZ83zlg9L4MJbqUVUuj/xYQafkm9Q== X-Received: by 2002:ac8:5755:: with SMTP id 21mr6883346qtx.267.1626399868412; Thu, 15 Jul 2021 18:44:28 -0700 (PDT) Received: from hurd (dsl-159-138.b2b2c.ca. [66.158.159.138]) by smtp.gmail.com with ESMTPSA id f2sm2681896qte.67.2021.07.15.18.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jul 2021 18:44:28 -0700 (PDT) From: Maxim Cournoyer References: <846621f26464358f595a8df895c68f9ee7e61175.camel@telenet.be> Date: Thu, 15 Jul 2021 21:44:26 -0400 In-Reply-To: <846621f26464358f595a8df895c68f9ee7e61175.camel@telenet.be> (Maxime Devos's message of "Fri, 09 Jul 2021 20:44:53 +0200") Message-ID: <875yxbnibp.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626399913; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=UX2XLBm0XbDgGuDBHgd9p8KIEfskT9zvkVfBwuutKBc=; b=UjILC7z7wlWkvradgacBeXCDGNJX0AtD+DXEhFP9jrBjUSa8PD0duDEw4TqCvXFTGZPxur LVjSIOIMhhT9wb4EnQLNEz47TsQTAjbWvN3pieLZg+RWphg99TjH4TDduxQ7dTQRlpYZji hNZ0OqQorZ6eKKg8pCILZEkA2IjJG8tQQq/04x3XOrXDuNh58WVSv9xrh7CL6mdHeHZsux voyiIrEWlFrmIXjIISpebt0To0UXQvWZYaHQkQ+irTzYMoLHk0Y2luy3rQPsF6H9G5P1Pc toEB8LfXfl+hIB4JyvPzQxPm8Vq6unGKJGBa3sbUynqdh2Do8mZ0u4oqSHTrYw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626399913; a=rsa-sha256; cv=none; b=XRQIODv11GzRsQA3lj9qJgheA4B4FOZYymqyphYGW0s0+oiJS2xn7uN0VRXv95bt2KAKO1 5/HLMfxSvdCFWAPKZXkwjM+Qya8NA7NP/EmiG4yCx4k3ACHUviU3ym+5BksYpas++XngP0 2oYrYPh9CZq09mIg6jv77AHCvYbcz/PVucGJ0XKzzPw4i8+XAwCjDw04oNH3W1TsAZRqLm bfWwQORyCeV08tVZ4S7hyzUfaBwPbHJzqfXg1xyVEpQBI0lSflI/9upAkgNB+cscDYnPev 84wfMaxue9sOBNm7fN6JJBzmNwBEYnGTTNp8N5pu0XihUwW4OWw9qNrmGHxjFw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b="e/KiQIy6"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b="e/KiQIy6"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: B553218B62 X-Spam-Score: -1.30 X-Migadu-Scanner: scn1.migadu.com X-TUID: Z9gkqbM2fwaA Hello, Maxime Devos writes: > > From 686302198208997c170b590b69c2a38a119b55c9 Mon Sep 17 00:00:00 2001 > From: Maxime Devos > 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