From patchwork Fri Sep 4 04:33:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Gibbons X-Patchwork-Id: 23888 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7F15927BBE8; Fri, 4 Sep 2020 05:34:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CD53C27BBE7 for ; Fri, 4 Sep 2020 05:34:09 +0100 (BST) Received: from localhost ([::1]:55628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kE3QO-0005zL-Ob for patchwork@mira.cbaines.net; Fri, 04 Sep 2020 00:34:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kE3QI-0005zB-QN for guix-patches@gnu.org; Fri, 04 Sep 2020 00:34:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53586) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kE3QI-0001xa-HF for guix-patches@gnu.org; Fri, 04 Sep 2020 00:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kE3QI-0007aK-Ew for guix-patches@gnu.org; Fri, 04 Sep 2020 00:34: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: Fri, 04 Sep 2020 04:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43194 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43194@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.159919402529131 (code B ref -1); Fri, 04 Sep 2020 04:34:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Sep 2020 04:33:45 +0000 Received: from localhost ([127.0.0.1]:36899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kE3Q1-0007Zn-Jp for submit@debbugs.gnu.org; Fri, 04 Sep 2020 00:33:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:35294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kE3Q0-0007Zg-N7 for submit@debbugs.gnu.org; Fri, 04 Sep 2020 00:33:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kE3Q0-0005yZ-F0 for guix-patches@gnu.org; Fri, 04 Sep 2020 00:33:44 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:35539) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kE3Py-0001wH-Ro for guix-patches@gnu.org; Fri, 04 Sep 2020 00:33:44 -0400 Received: by mail-pl1-x62f.google.com with SMTP id a8so578325plm.2 for ; Thu, 03 Sep 2020 21:33:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=ZY0MkLKFv+FEhkxx3D1HOdbpNVKnKD8p7OO54IBKPBI=; b=P/joB3AV7EKX8ynv31vKc9M668gWY0cFdZAaWDWFGR6zeYnjK35TiFgkcVh3KyogU4 0qZKB1EK1etQypX1foqonrV2pRkjzqXWhXpXmMvYNFZIBNhLK4rVCngXodnKf72imXit Ahu+FLfVQKwxz0mOVVkmVNVLOXv/Sz0VWVDdTZEP9ev/M/rFqWivrNHhGFguHiQFmn7v etR34hzOzLwVzH/CgZNuFnVHWln5oqIA1OlAnRjl3ZfJ22r9j9EXA20Vu1soy63PpG25 LAMqpP20A8Y9LF31LlltaY8ghRCkPSVEyU80L6NHgkeeVaTmO/bmwPi8odMfd7NCmSym jOiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=ZY0MkLKFv+FEhkxx3D1HOdbpNVKnKD8p7OO54IBKPBI=; b=ofkPtheF6qF9yodOLq9H88lN/6Xct18LRMH4txxUS/GcFZWgA0HmVRCqnK88EPve49 LVpJn8j5h+4BtuWj2nn04xBEnGdkNxQeE4m6qzJwfEi84XLDLS3n4nvBsdGR2zQFqxF1 waLBpVgRZOl7/fi5QBowQpAq9BlGC08wr1RlBHJLtJEsgW4f3Kckqq2Gog7DQaHnb2zM 10lmKuQ8YbHxd1a/ZPJw6NbKJx8YmpMmdhtWzelf6zCMPnr+jw0QbzUxzaHTx7HChqj5 YCioSncMkM3kx3qU68aqbKoROoidavnyjqsL+Z6FCZUQ+j4Jrao/6hemwXl6V98T9ZsZ AJBQ== X-Gm-Message-State: AOAM532LFAo5pX35Aj9WCYZHIrmaC4N7qZAuOme7c5Qs9tJIvsifHV8t LkozX4u5eQN1FKLt05t+JCWiHoofhvadKg== X-Google-Smtp-Source: ABdhPJzwtxX5qL2TNFnZR42+PZKjSgN+N8uUj/5qQJL42i6sV9w0Im4RdqpjXf1DcK6dpxml76WVug== X-Received: by 2002:a17:90a:f998:: with SMTP id cq24mr6583634pjb.9.1599194021277; Thu, 03 Sep 2020 21:33:41 -0700 (PDT) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id e1sm4860751pfn.78.2020.09.03.21.33.40 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Sep 2020 21:33:40 -0700 (PDT) From: Jesse Gibbons Message-ID: <69eb1bb4-ff32-9267-84cf-0c36d52e32c1@gmail.com> Date: Thu, 3 Sep 2020 22:33:31 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.12.0 MIME-Version: 1.0 Content-Language: en-US Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=jgibbons2357@gmail.com; helo=mail-pl1-x62f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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. -Jesse 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 --- gnu/packages/games.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ccdc47d5c7..7540cf4603 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2859,7 +2859,7 @@ interface or via an external visual interface such as GNU XBoard.") (ftp-directory . "/chess"))) (license license:gpl3+))) -(define freedink-engine +(define-public freedink-engine (package (name "freedink-engine") (version "109.6") @@ -2911,7 +2911,7 @@ game data files but it also supports user-produced game mods or \"D-Mods\". To that extent, it also includes a front-end for managing all of your D-Mods.") (license license:gpl3+))) -(define freedink-data +(define-public freedink-data (package (name "freedink-data") (version "1.08.20190120") @@ -2963,8 +2963,10 @@ and its numerous D-Mods.") (define-public freedink ;; This is a wrapper that tells the engine where to find the data. - (package (inherit freedink-engine) + (package ;(inherit freedink-engine) (name "freedink") + (version (package-version freedink-engine)) + (source #f) (build-system trivial-build-system) (arguments '(#:builder (begin @@ -2987,7 +2989,13 @@ exec ~a/bin/freedink -refdir ~a/share/dink\n" (inputs `(("engine" ,freedink-engine) ("data" ,freedink-data) ("bash" ,bash))) - (native-inputs '()))) + (native-inputs '()) + (home-page (package-home-page freedink-engine)) + (synopsis (package-synopsis freedink-engine)) + (description (string-append (package-description freedink-engine) +"\n\nThis package provides a wrapper that points the engine to +the upstream \"vanilla\" data.")) + (license license:gpl3+))) (define-public xboard (package -- 2.28.0