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 8OrQMKwb32BKMQEAgWs5BA (envelope-from ) for ; Fri, 02 Jul 2021 15:59:08 +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 GPBwLKwb32A4BAAAbx9fmQ (envelope-from ) for ; Fri, 02 Jul 2021 13:59:08 +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 8042721941 for ; Fri, 2 Jul 2021 15:59:08 +0200 (CEST) Received: from localhost ([::1]:56530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzJhD-0004mW-FL for larch@yhetil.org; Fri, 02 Jul 2021 09:59:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzJh8-0004lA-M4 for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzJh8-0002KC-EU for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzJh8-0000rV-Ew for guix-patches@gnu.org; Fri, 02 Jul 2021 09:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49329] [PATCH 1/4] gnu: python2-renpy: Drop unused Ren'py sources. References: In-Reply-To: Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jul 2021 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49329 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49329@debbugs.gnu.org Received: via spool by 49329-submit@debbugs.gnu.org id=B49329.16252343203261 (code B ref 49329); Fri, 02 Jul 2021 13:59:02 +0000 Received: (at 49329) by debbugs.gnu.org; 2 Jul 2021 13:58:40 +0000 Received: from localhost ([127.0.0.1]:36836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzJgl-0000qS-Jy for submit@debbugs.gnu.org; Fri, 02 Jul 2021 09:58:39 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:40323) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzJgh-0000po-Ho for 49329@debbugs.gnu.org; Fri, 02 Jul 2021 09:58:38 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GGcB03P4Wz1LXt4 for <49329@debbugs.gnu.org>; Fri, 2 Jul 2021 15:58:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GGcB03P4Wz1LXt4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1625234312; bh=r5yNDmAn9XiqLGr/D0Ac28GU5AV0qm5+5HakMyrZvI8=; h=From:To:Subject:Date:From; b=W/Bl0n8a/fbNpRLBW4gtsA8wRA5Qr+cEUsN3+zWAQRWYBKywjNVaXmB7j78fV0L7z 2HaG8vmL7FLsfdbWG86nhluBIlhfJXPLy9NJPxP62FUapbtrC8Aj13DWuGhuf67O7j oGaMjQomSU0D2HrOUOmSLA5FOgQlNHoX7CU+axFQ= From: Leo Prikler Date: Fri, 2 Jul 2021 15:58:15 +0200 Message-Id: <20210702135818.16084-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.116 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=1625234348; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: 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=r5yNDmAn9XiqLGr/D0Ac28GU5AV0qm5+5HakMyrZvI8=; b=Fo++XoQjRxPwYiHDaVTpju9+lDeVHzinE5a001pagpb9S5g5nb6G5HRlODtK9sGCfRKePt 5ZtgyToT0oUR4q/osj33sYWUIC1lzZzeV6w4QaJbGc1JAr89IVVJVjThU5XZ96lSmHUAQb +xKgZwl89mt3/8Thdr3JHznntuyaA2xKYzYqSFB8A7C0wyFbIGt5REQuejy0BxLva0Cc6H mk0QU0+g5PkwzekBOMgIJ3uIdzKuSB16XUNWoX9rqZDlamiJ/avhbC/kcjOpw1ipPo6Xdm wc6WtlceajJhxpTEJ69x05SIkN+6qlxkHyhRspL+Vpy2xNHPsBa6+pm4NYeXfg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625234348; a=rsa-sha256; cv=none; b=SdRKAc4R4S0YiB1han29t9JoF6zbuqJCo3v0APiXD66UherhbtPT37ATtfLIfeHBGQeJaR ennwD9CAO4a/gISbJeloQZGpEXGxKxNAfb21R5WQ+8GERnZOvEBQRVkQKxkFRjwYOcKVV7 cVSRvghd+9Ep4g1oWzBdpEzScUSEt25iHWaPw/lVNGwmq7y+fHSir2inqj7lnPEdEnH1tD GsTQpPAXwkPulUQ0824Yx5tMr0kecU5qDRiMxUxcMAAJhkdhCYdxI4mon3wlgfYFSht9fy 9E7nDjgxKGPMBxgAB3Edcfg7FR5Y/tXglS6/qIs8jmReLnCnYgEBKUtqyjzPIQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b="W/Bl0n8a"; 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: 3.69 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b="W/Bl0n8a"; 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: 8042721941 X-Spam-Score: 3.69 X-Migadu-Scanner: scn0.migadu.com X-TUID: q3dSAUE0ohZh These sources are written in Ren'py (the language) and thus not particularly useful before renpy itself is built. In particular, they serve no purpose when installed without prior compilation. * gnu/packages/game-development.scm (python2-renpy)[#:phases]: Drop installed "common" folder. (renpy)[#:phases]: Adjust comment accordingly. --- gnu/packages/game-development.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 9069b88d0c..22c44a585c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1230,7 +1230,8 @@ developed mainly for Ren'py.") (with-directory-excursion "module" (apply (assoc-ref %standard-phases 'install) args)) (copy-recursively "renpy" - (string-append out site "/renpy"))) + (string-append out site "/renpy")) + (delete-file-recursively (string-append out site "/renpy/common"))) #t))))) (inputs `(("ffmpeg" ,ffmpeg) @@ -1304,11 +1305,14 @@ modules of Ren'py.") ;; After finishing this step, "out" will have the following: ;; |-- bin/renpy ;; `-- share/renpy ; i.e. path_to_renpy_base() - ;; `-- common + ;; |-- common + ;; `-- gui ;; - ;; Note that common is also a de facto unused directory in - ;; python2-renpy. On other systems, renpy_base would point to - ;; site-packages or even somewhere in /opt. + ;; Note that common shares the source files that would be installed + ;; by python2-renpy (which are instead deleted from that package), + ;; but also contains their byte-compiled versions. + ;; On other systems, renpy_base would point to site-packages or + ;; even somewhere in /opt. ;; The former approach is not as straightforward as it seems ;; -- it causes renpy to load files twice for some weird reason -- ;; and the latter is impossible on Guix. Hence the detour through @@ -1319,9 +1323,11 @@ modules of Ren'py.") ;; well. This differs from the traditional layout, which is ;; roughly the following: ;; `-- Super Awesome Game - ;; |-- game ; <- the folder we actually want - ;; |-- lib ; compiled renpy module and dependencies - ;; |-- renpy ; Ren'py python code (source + compiled) + ;; |-- game ; <- the folder we actually want + ;; |-- lib ; compiled renpy module and dependencies + ;; |-- renpy ; yet another copy of Ren'py's code + ;; | |-- common ; the common folder from above + ;; | `-- ... ; Python code (source + compiled) ;; |-- Super Awesome Game.py ;; `-- Super Awesome Game.sh (let* ((out (assoc-ref outputs "out")) -- 2.32.0