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 8CWPKC4OCWEXYAEAgWs5BA (envelope-from ) for ; Tue, 03 Aug 2021 11:36:46 +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 oPw5JC4OCWH8YAAAB5/wlQ (envelope-from ) for ; Tue, 03 Aug 2021 09:36:46 +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 3FD5A1648B for ; Tue, 3 Aug 2021 11:36:46 +0200 (CEST) Received: from localhost ([::1]:40090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAqqr-0006zi-83 for larch@yhetil.org; Tue, 03 Aug 2021 05:36:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAqqd-0006zN-30 for guix-patches@gnu.org; Tue, 03 Aug 2021 05:36:31 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mAqqc-0002G4-Sw for guix-patches@gnu.org; Tue, 03 Aug 2021 05:36:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mAqYk-0003BQ-60 for guix-patches@gnu.org; Tue, 03 Aug 2021 05:18: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: Tue, 03 Aug 2021 09:18: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.162798226712211 (code B ref 49828); Tue, 03 Aug 2021 09:18:02 +0000 Received: (at 49828) by debbugs.gnu.org; 3 Aug 2021 09:17:47 +0000 Received: from localhost ([127.0.0.1]:39849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAqYU-0003At-Pe for submit@debbugs.gnu.org; Tue, 03 Aug 2021 05:17:47 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:64785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAqYR-0003Af-Q0 for 49828@debbugs.gnu.org; Tue, 03 Aug 2021 05:17:45 -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 4Gf8R84n0fz1LZW9; Tue, 3 Aug 2021 11:17:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4Gf8R84n0fz1LZW9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1627982260; bh=VTzgwy1dofhRwnac4x5ReSkUgfpWYmcW6V3T7EomWOQ=; h=Subject:From:To:Date:In-Reply-To:References:From; b=Kfr9pZAEKaiv0ChZR+INwiyKB31dmdNs37YfRQMtJ2n2I/vlpKNpqLKHV3bFOREnN RFZQsKpPg9VeV6MmTQaPZmJG1Eaq/44I+BMwahX+BDwrpzecmFM8b632v9dWAwOU87 4GjDJY+unBHiUuSorJCA+7KYVBoxWM1IjAqBr3HQ= Message-ID: <60c5062a7debff22cee27198c2548605fd7441e0.camel@student.tugraz.at> From: Leo Prikler Date: Tue, 03 Aug 2021 11:17:39 +0200 In-Reply-To: <20210802155019.6122-5-maximedevos@telenet.be> References: <20210802155019.6122-1-maximedevos@telenet.be> <20210802155019.6122-5-maximedevos@telenet.be> 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=1627983406; 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=VTzgwy1dofhRwnac4x5ReSkUgfpWYmcW6V3T7EomWOQ=; b=FnLsZL3DAeq7ZgfujMmtRkQd1KRM+J9DJMAyNKGTxZz44tdvFxhTm4ly33hJxh6uhQhSG9 mlW9miGHTgt+V9KwowsZp6t8RsoeygqJBimDfNkI/Q3MOaSL0iK/2Ugwn0hS2+5OC4GZ+D hKP7E0IVvuaKQ+T/WMiy0TW7M8bWXKycsdizigch+91HJ8lvDU6dL1FvTL9/VIBUMnYFZD +B7NOWzcJ3dsoaUPCr08MmZOk33rlHpMBjq0SRKa4XEgWNmwkRlneQwFgqxJXpy58EmAES Yxhw3VPj98fozaKBCAphFZHLBEkGHkYjMCVpzh91J6e5eOvwRGmnML1q5KPqGg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627983406; a=rsa-sha256; cv=none; b=RKO2ceGXL7NP2pTn7N1E5TV1NJC0Cl2ncWoPWY/Ht8HkSi76kXXs9926q0oIuzuEvNRLe5 QM8S5Gta5i7uQQa8XpeOHKpMWlbBd5FqvPzTCc2NRZh/KN1sp61WHZimoYhdldNfQ9GT78 K84oFtb4prz7r/3kNqxRgJvOT1sbsOpMFFAHcfrDG3QP4QdLwzLyk5Vt7vOYpeUnr9HiTv QjZXwAsxpujQ7fsd4z03Y7QT2IW1mTCT3ngWJFTBMkpY1P80J+ijEhF4z0bl+jAitWn86X 937fDyqDJezo0u96gnQ5Gd3W7qBX8eH+Ll7vNNJYHiW6++01UV+RzxTY4SZSGg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=Kfr9pZAE; 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=Kfr9pZAE; 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: 3FD5A1648B X-Spam-Score: -1.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: RNq+rXC51KTd Hi, I'd merge this and 04/20 into a single patch. 04/20 does of its own give a good incentive as to why a new build system is to be used (this could instead be handled by the importer), with this phase added it makes slightly more sense. OTOH, perhaps we shouldn't install those shell scripts in the first place? Perhaps we can instead make the importer generate packages based directly on copy-build-system, in which those static strings are already evaluated. WDYT? Am Montag, den 02.08.2021, 17:50 +0200 schrieb Maxime Devos: > * guix/build-system/minetest.scm > (%standard-phases): New variable. Delete "patch-source-shebangs" > phase. > (lower-mod): Set #:phases to value of new variable. > --- > guix/build-system/minetest.scm | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/guix/build-system/minetest.scm b/guix/build- > system/minetest.scm > index 29866ced6d..993c5631eb 100644 > --- a/guix/build-system/minetest.scm > +++ b/guix/build-system/minetest.scm > @@ -35,6 +35,14 @@ > (substring package-name 9) > package-name)) > > +(define %standard-phases > + ;; The source code sometimes contains shell scripts which are used > for > + ;; development but not at run time (e.g. listnodes.sh in > + ;; minetest-homedecor-modpack). Don't make them retain a > reference > + ;; to bash-minimal. > + '(modify-phases (@ (guix build copy-build-system) %standard- > phases) > + (delete 'patch-source-shebangs))) > + > (define (lower-mod name . arguments) > (define lower (build-system-lower copy-build-system)) > (apply lower > @@ -42,6 +50,7 @@ > #:install-plan > `'(("." ,(string-append "share/minetest/mods/" > (guix-name->mod-name name)))) > + #:phases %standard-phases > arguments)) > > (define minetest-mod-build-system