From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MDIlFLkADGH+8AAAgWs5BA (envelope-from ) for ; Thu, 05 Aug 2021 17:16:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 8OjGD7kADGEmfQAAB5/wlQ (envelope-from ) for ; Thu, 05 Aug 2021 15:16:09 +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 F3935827D for ; Thu, 5 Aug 2021 17:16:08 +0200 (CEST) Received: from localhost ([::1]:47560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBf6O-00052T-5r for larch@yhetil.org; Thu, 05 Aug 2021 11:16:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBf6I-0004zS-ND for guix-patches@gnu.org; Thu, 05 Aug 2021 11:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36548) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mBf6I-0005xk-Fp for guix-patches@gnu.org; Thu, 05 Aug 2021 11:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mBf6I-0000Ki-8I for guix-patches@gnu.org; Thu, 05 Aug 2021 11:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49828] [PATCH 05/20] build-system: minetest: Don't retain references to "bash-minimal". Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Aug 2021 15:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 49828@debbugs.gnu.org Received: via spool by 49828-submit@debbugs.gnu.org id=B49828.16281765371246 (code B ref 49828); Thu, 05 Aug 2021 15:16:02 +0000 Received: (at 49828) by debbugs.gnu.org; 5 Aug 2021 15:15:36 +0000 Received: from localhost ([127.0.0.1]:48094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBf5s-0000K2-IC for submit@debbugs.gnu.org; Thu, 05 Aug 2021 11:15:36 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:41718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBf5p-0000Jo-R6 for 49828@debbugs.gnu.org; Thu, 05 Aug 2021 11:15:35 -0400 Received: from nijino.local (194-118-35-216.adsl.highway.telekom.at [194.118.35.216]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GgXH60Qs2z1LB21; Thu, 5 Aug 2021 17:15:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GgXH60Qs2z1LB21 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1628176530; bh=/yhYM48BqQNa+eQDsxybgRGiW5igL8enWHZp1o1XmOU=; h=Subject:From:To:Date:In-Reply-To:References:From; b=Rkvst1tdzZ2eDBg+E7QFD1RRNyLcysBp5U91Xi1cunKhp6XAqmhhVWabUDtCw1Yx6 KcxSgbQKskzU2Xj79uJ4j0z7ttgUA1lqLccYV5i8rOQ4/+4fS8Pl8aRV1gSSF2y7pQ fXghdLZbpYm4mWQXxg9sUU0WtUFg+r2v2v7BYd18= Message-ID: <96a038c941308c8ec427d4b37bb333b32a7d0204.camel@student.tugraz.at> From: Leo Prikler Date: Thu, 05 Aug 2021 17:15:29 +0200 In-Reply-To: References: <20210802155019.6122-1-maximedevos@telenet.be> <20210802155019.6122-5-maximedevos@telenet.be> <60c5062a7debff22cee27198c2548605fd7441e0.camel@student.tugraz.at> <265c85f914757066aee6b6933ba58bf1abd2bc84.camel@telenet.be> <8d13a1057f368f47eef8da538c554a379892cacc.camel@student.tugraz.at> <7680df67d8be80c1d55771407256c28b76e0d836.camel@telenet.be> <2a49c566e1ecc280db79bcda1e893547216dd83a.camel@student.tugraz.at> <8a8699af5e530cff4bab22aad4e5fa1862ebffc7.camel@telenet.be> <1a63353207ea0cbccaaf3138d42148fe5a98da62.camel@student.tugraz.at> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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=1628176569; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: 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=/yhYM48BqQNa+eQDsxybgRGiW5igL8enWHZp1o1XmOU=; b=hI+XVR/OapR/97vXVTajeWpXuODzbdxbcyxFMcG8Ge5QGtO98fvwJw1z7Wxmg3EUTxf66J /TjCkG0e3FEgNExXRQ0qjg36/ynIS5t0oEjRJkpXn2GITaSora6adqYcfRAjPwwncm4MUX bTd2nu3ipsZLAIBQrW8DpvwExCmKgvVNMh8DIq4sTV0LTPJ+OtQRU1U4ni2hVCJrtb5kL+ dpFDVujb1dzli90gLTUkpVjOykzBWiuAgLfKGJ+2AxHANJOfR4nacPCLHFiVq9ev5SjhzP B9LQVO0p+P5n03VmGepEDygFlMyu448TJj/JnsSx3TCV/oz0sXYTYz3MQXHu3g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628176569; a=rsa-sha256; cv=none; b=i4jr/XQ+Ce0zpsMfhMgHr97/R8xBny4x1a7rvSMarYhQgVsMZ3hR0f2y4RpWKBZAOYJboP q+uDDRWoNOw2qNj1AGTciRcivKDfYlzVyECrmOb1eE745ZpSU7mb12e+TNeFK1pf77TSRM /ZePTNWA8OIjkqerskEuSCa2uV5LzQI/Y09F9EOUyj/9S8uoTUP+VZGXpqRgeL1k3BQfQx S1ymBpSd0HM8CDYamLB2JCt5/wTgZ4+WdYZoUptgqjpxlIovSqdPqqOKCAYwNTK7EQ5q7K dJOemeq6AIyfLLqqEc2Lq4RFLJ3Uj9+YeCHgpof32yLTo2mtoYa9aaFY4g/TbA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=Rkvst1td; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (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.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=Rkvst1td; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (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: F3935827D X-Spam-Score: -1.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: wjf3fekPzGsu Am Donnerstag, den 05.08.2021, 16:41 +0200 schrieb Maxime Devos: > Leo Prikler schreef op do 05-08-2021 om 15:42 [+0200]: > > Am Donnerstag, den 05.08.2021, 15:16 +0200 schrieb Maxime Devos: > > > [...] > > > > > +(define* (install #:key inputs #:allow-other-keys #:rest > > > > > arguments) > > > > > + (apply (@@ (guix build copy-build-system) install) > > > > > + #:install-plan (mod-install-plan (apply guess-mod- > > > > > name > > > > > arguments)) > > > > > + arguments)) > > > > @@ is a code smell, as far as Guix is concerned. Rather import > > > > copy-build-system with the copy: prefix. > > > > > > 'copy-build-system' does not export 'install', so I have to use > > > '@@' > > > here. > > > Modifying 'copy-build-system' to export 'install' would > > > presumably > > > entail > > > a many rebuilds. > > I think the thing that's usually done here is fetching through > > %standard-phases. > > I.e. (define copy:install (assoc-ref copy-build-system:%standard- > > phases > > 'install)) > > Done. LGTM. > > > > > +(define png-file? > > > > > + ((@@ (guix build utils) file-header-match) %png-magic- > > > > > bytes)) > > > > Likewise import (guix build utils) directly. > > > > > > Likewise. > > In that case fine, but make a note to move the variable and > > procedure > > over to (guix build utils). > > I made a note. I'm not seeing it, did you send the right file? > > The new lower-mod mostly LGTM, but > > > + ;; Mods are architecture-independent. > > > + ((#:target target #f) #f) > > should be `target' imho. What if the mod e.g. actually builds a > > shared > > object and somehow uses Lua's very dynamic FFI to load it? (Even > > if > > that's not currently possible, it might be in the future). Setting > > it > > to #f by default OTOH sounds very reasonable to me. > > 'target' is set by 'make-bag' in (guix build-system), so if the code > above is made > > ((#:target target #f) target) > > then #:target will always be set to some triplet. Mostly harmless, > but a bit a waste of disk space since this leads to (slightly) > different derivations depending on the value of "target". I think deduplication should take care of that, but yeah. > I don't think any mods use Lua's FFI, but some mods use 'os.execute', > which takes a file name referring to an executable, which might need > to be absolutised in Guix, and therefore some mods are architecture- > dependent. > > It dropped the ((#:target target #f) #f). I noticed "#:implicit- > cross-inputs?" wasn't set to #f. That has been corrected as well. Good catch. Since my only remaining complaint is somewhat minor, you don't need to resend this patch; I'll have a look at the importer later (or maybe someone else gets to do that in between), but I won't cover the package definitions for the mods. If they work for you and you checked the licenses, they're probably going to be fine. Greetings