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 yGd3A6ZvVl9sDAAA0tVLHw (envelope-from ) for ; Mon, 07 Sep 2020 17:36:38 +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 AGjaOqVvVl8hWwAAbx9fmQ (envelope-from ) for ; Mon, 07 Sep 2020 17:36:37 +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 9BCE59404D3 for ; Mon, 7 Sep 2020 17:36:37 +0000 (UTC) Received: from localhost ([::1]:51970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFKiT-0002MO-Nh for larch@yhetil.org; Mon, 07 Sep 2020 13:14:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFKiQ-0002M0-Fx for guix-patches@gnu.org; Mon, 07 Sep 2020 13:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39127) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFKiQ-00048a-72 for guix-patches@gnu.org; Mon, 07 Sep 2020 13:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kFKiQ-0006L3-2U for guix-patches@gnu.org; Mon, 07 Sep 2020 13:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43194] [PATCH] gnu: publicly define freedink-engine and freedink-data Resent-From: Jesse Gibbons Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Sep 2020 17:14: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 43194@debbugs.gnu.org Received: via spool by 43194-submit@debbugs.gnu.org id=B43194.159949881824325 (code B ref 43194); Mon, 07 Sep 2020 17:14:02 +0000 Received: (at 43194) by debbugs.gnu.org; 7 Sep 2020 17:13:38 +0000 Received: from localhost ([127.0.0.1]:50672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFKi1-0006KH-Nn for submit@debbugs.gnu.org; Mon, 07 Sep 2020 13:13:38 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:44963) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFKi0-0006K4-M0 for 43194@debbugs.gnu.org; Mon, 07 Sep 2020 13:13:37 -0400 Received: by mail-pg1-f193.google.com with SMTP id 7so8272223pgm.11 for <43194@debbugs.gnu.org>; Mon, 07 Sep 2020 10:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=5AI1gTXZwvfcFgyytyP54Ym3yotIE1ncy1vkcm5zbQE=; b=utDRGSr7Niu/tPzshSreBDot7ZP0anVBAHjnqMjVxDoWWw5KT9mGvVZktq9d+IwvbS ZKXdmFrUpt/zphsDOaDJgxkmR5KCq5zZQq44frmdLM6/QZ84msRktMJHhgJZC9mBpWWh bgerms19YHLDiw/4sh2/E63OIXa6k1vmcB3MKy6DVSLWkjDEaKgb3sKREtqZAtlDrs5v ht+akIOftuVcIxjRcmSSrSQIhjoMqo0eMzaRmgYPfvlQIMKdmAehKIwLbnl+O4dDHhA/ BXFJF7FUtlSPMq1i9NW8Lqs64LnyQajgw16wSXPEsgUUejQydipwSM70kE2QIZN4cc6s y24g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=5AI1gTXZwvfcFgyytyP54Ym3yotIE1ncy1vkcm5zbQE=; b=Ct2HGinV0jLLZrL9XO+ZWzMAmGwC3RuLLMGF0VLYK5Twee4JLXFhwW9yaiAu1dJEaE hq95LslsRzjMSgmEfMfC+1tEKcuiN9nLxVre7umePdQr2DqM//wUg45tta76g15w5bHA f2n7BY7ni+yw4mXVj1JkHp2M7wWCIOpCwB/Qm71zdxlmfKOti2Kqw2HSjgK9IqUDys5g cy8tjzcF7sn02U/ce5zeu1bJuzPt2nRHegL8gC0bm5edeAoAUy59wIF7WKJyfQNe2peC Os/VBBVF5fLfQcfHs/bEZSSsURKbuYq1HVeVykUhT/et1a0vqywZF63Fbr96K+xqAk8O GMbg== X-Gm-Message-State: AOAM5339Ne1D7b0pNd3mb/GrMVbpZivO5AQSu2DNrlV4wp+heN9OQRV3 rY9hxaDikS4dxqWAICpIpspCfLVXPXOhPg== X-Google-Smtp-Source: ABdhPJyTTK8vDIHKbUb62K2rgi4BeC5HIAhstDo93siDLki+4HMJl6J8RIaVcv9E8mE96Q+V4kJX5g== X-Received: by 2002:a63:4d5b:: with SMTP id n27mr9342069pgl.360.1599498810114; Mon, 07 Sep 2020 10:13:30 -0700 (PDT) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id e66sm15390399pfa.130.2020.09.07.10.13.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Sep 2020 10:13:29 -0700 (PDT) References: <69eb1bb4-ff32-9267-84cf-0c36d52e32c1@gmail.com> <87a6y1itry.fsf@gnu.org> From: Jesse Gibbons Message-ID: <197d4953-0c53-eb82-24e9-1dc99d0b6e3b@gmail.com> Date: Mon, 7 Sep 2020 11:13:17 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.12.0 MIME-Version: 1.0 In-Reply-To: <87a6y1itry.fsf@gnu.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.6 (--) 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=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=utDRGSr7; 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-Spam-Score: 0.09 X-TUID: 709OA7Hnbz6Y Thank you for reviewing. On 9/7/20 7:46 AM, Ludovic Courtès wrote: > 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’m 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=all 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. > >> >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 freedink-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. 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. > > Thanks, > Ludo’. -Jesse