From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6NkLFHBtVl8MZQAA0tVLHw (envelope-from ) for ; Mon, 07 Sep 2020 17:27:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id uurqD3BtVl+2VQAAbx9fmQ (envelope-from ) for ; Mon, 07 Sep 2020 17:27:12 +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 B90FD9403C9 for ; Mon, 7 Sep 2020 17:27:11 +0000 (UTC) Received: from localhost ([::1]:58486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFKv8-0006Bi-5U for larch@yhetil.org; Mon, 07 Sep 2020 13:27:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFKv0-0006AG-RC for guix-patches@gnu.org; Mon, 07 Sep 2020 13:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39164) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFKv0-00061Y-Hk for guix-patches@gnu.org; Mon, 07 Sep 2020 13:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kFKv0-0000Pr-CB for guix-patches@gnu.org; Mon, 07 Sep 2020 13:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43194] [PATCH] gnu: publicly define freedink-engine and freedink-data Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Sep 2020 17:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43194 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jesse Gibbons Cc: 43194@debbugs.gnu.org Received: via spool by 43194-submit@debbugs.gnu.org id=B43194.15994995831553 (code B ref 43194); Mon, 07 Sep 2020 17:27:02 +0000 Received: (at 43194) by debbugs.gnu.org; 7 Sep 2020 17:26:23 +0000 Received: from localhost ([127.0.0.1]:50710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFKuN-0000Oz-3W for submit@debbugs.gnu.org; Mon, 07 Sep 2020 13:26:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFKuM-0000Ol-6h for 43194@debbugs.gnu.org; Mon, 07 Sep 2020 13:26:22 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:46355) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFKuG-0005we-W7; Mon, 07 Sep 2020 13:26:17 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=60762 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kFKuG-0002UZ-83; Mon, 07 Sep 2020 13:26:16 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <69eb1bb4-ff32-9267-84cf-0c36d52e32c1@gmail.com> <87a6y1itry.fsf@gnu.org> <197d4953-0c53-eb82-24e9-1dc99d0b6e3b@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 22 Fructidor an 228 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 07 Sep 2020 19:26:10 +0200 In-Reply-To: <197d4953-0c53-eb82-24e9-1dc99d0b6e3b@gmail.com> (Jesse Gibbons's message of "Mon, 7 Sep 2020 11:13:17 -0600") Message-ID: <87y2llfqh9.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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-Spam-Score: -1.01 X-TUID: nKg7hI0pUYT5 Hi, Jesse Gibbons skribis: >>> The attached patch publicly defines freedink-engine and >>> freedink-data. This resolves many of the issues described in >>> #43061. This patch, combined with patch #43193(sent earlier today), >>> can close #43061. >> Now I=E2=80=99m confused: how does it help to make freedink-{engine,data} >> public? > Other than making guix more consistent in publicly defining game data > packages (0ad-data and megaglest-data are public, and I like that -- I > could write a good article about why, which I think would be a worthy > entry in the guix blog, especially after #43193 is applied), there are > 4 reasons for this change: > > -> freedink-dfarc has problems locating the editor, installed in > freedink-engine. I guess we could also fix this by making > freedink-engine an input to freedink-dfarc and splicing a reference to > it into the default configuration? > > -> Unless freedink-data is public, `guix build --source freedink-data` > fails, and `guix build --sources=3Dall freedink` does not build a source > for freedink-data. I think future users who want to alter the freedink > data would appreciate the ability to use guix to get the data. Also, > it's pointless to use the editor on the installed freedink-data > because it's read-only when it's installed. > > -> Back when I was fixing freedink, I found it difficult to debug > without freedink-engine being public, because freedink does nothing > with the freedink-engine source. > > -> Freedink-engine installs desktop files to launch freedink without > freedink-dfarc or the console. This is actually a new issue I will > address in an updated patch: the desktop files fail because the data > location is not hard-coded. I think the freedink desktop file can be > patched if freedink-data is an input, but, like I said above, it's > pointless to use dinkedit on a read-only directory, so I intend to > remove it. OK, makes sense=E2=80=94thanks for explaining. >>> >From 583215aced9b557d6f4e54b290e788d33880c03c Mon Sep 17 00:00:00 2001 >>> From: Jesse Gibbons >>> Date: Wed, 26 Aug 2020 21:38:24 -0600 >>> Subject: [PATCH v1 1/1] gnu: publicly define freedink-engine and freedi= nk-data >>> >>> * gnu/packages/games.scm: (freedink-engine): make public >>> (freedink-data): make public >> [...] >> >>> (define-public freedink >>> ;; This is a wrapper that tells the engine where to find the data. >>> - (package (inherit freedink-engine) >>> + (package ;(inherit freedink-engine) >> Is it intended? Looks like inheriting avoids duplicating fields, no? > > Oops! I did not intend to leave (inherit freedink-engine) in a > comment. I initially commented it out because freedink does nothing > with the source anyway, and I wanted to see what would happen if I > removed the inheritance. I guess I forgot to remove the semicolon and > other additions. OK. If you send an updated patch, I=E2=80=99ll happily apply it, then! > As noted above, it is easiest to use freedink-dfarc to launch the > editor, but freedink-dfarc must be told what editor to use, and it is > easier to identify it if the editor is installed in a profile (or > included as an input). Also, freedink-engine includes (broken) desktop > files. Since freedink just installs a wrapper script around the > engine, and does not include the editor or any desktop files, perhaps > it would be better to put the wrapper script in freedink-engine (thus > fixing the desktop file), completely remove the freedink package, and > rename "freedink-engine" to just "freedink"? But freedink-dfarc would > still need to be able to launch freedink without pointing to any > read-only data if a user wants to test the edited freedink data. Maybe, sounds like a reasonable option. Thank you, Ludo=E2=80=99.