| Message ID | 538fccb4a1bc4005b85b43a168873abea5e95d42.1704028653.git.w@wmeyer.eu |
|---|---|
| State | New |
| Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EB79F27BBE9; Sun, 31 Dec 2023 13:19:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E86DD27BBE2 for <patchwork@mira.cbaines.net>; Sun, 31 Dec 2023 13:19:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1rJvib-0001nV-JD; Sun, 31 Dec 2023 08:19:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1rJviZ-0001n9-36 for guix-patches@gnu.org; Sun, 31 Dec 2023 08:19:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1rJviY-0003hc-M4 for guix-patches@gnu.org; Sun, 31 Dec 2023 08:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1rJviX-0008QW-Rc; Sun, 31 Dec 2023 08:19:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68173] [PATCH] gnu: Add morris. Resent-From: Wilko Meyer <w@wmeyer.eu> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 13:19:01 +0000 Resent-Message-ID: <handler.68173.B.170402870232342@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68173 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68173@debbugs.gnu.org Cc: Wilko Meyer <w@wmeyer.eu>, Liliana Marie Prikler <liliana.prikler@gmail.com>, =?utf-8?b?5a6L5paH5q2m?= <iyzsong@envs.net> X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Liliana Marie Prikler <liliana.prikler@gmail.com>, =?utf-8?b?5a6L5paH5q2m?= <iyzsong@envs.net> Received: via spool by submit@debbugs.gnu.org id=B.170402870232342 (code B ref -1); Sun, 31 Dec 2023 13:19:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Dec 2023 13:18:22 +0000 Received: from localhost ([127.0.0.1]:45812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1rJvht-0008PZ-Nl for submit@debbugs.gnu.org; Sun, 31 Dec 2023 08:18:22 -0500 Received: from lists.gnu.org ([2001:470:142::17]:35048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <w@wmeyer.eu>) id 1rJvhr-0008PK-7F for submit@debbugs.gnu.org; Sun, 31 Dec 2023 08:18:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <w@wmeyer.eu>) id 1rJvhi-0001dC-Ge for guix-patches@gnu.org; Sun, 31 Dec 2023 08:18:10 -0500 Received: from mail.wmeyer.eu ([95.216.196.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <w@wmeyer.eu>) id 1rJvhg-0003az-9i for guix-patches@gnu.org; Sun, 31 Dec 2023 08:18:10 -0500 From: Wilko Meyer <w@wmeyer.eu> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wmeyer.eu; s=mail; t=1704028685; bh=ymmwfl6femKCtfktldC6i/91wXIwWM8YLlSotBLKVyc=; h=From:To:Cc:Subject:Date; b=MLBEBnJESczJt57GbwT3VUpU/tWWcxOL/q2X//pvkO1uJHyMsAAMt3pYW6xU9qgZC bcg6LmzOc4rB55KesTNHF6oY8lpry8ctZlMhsETVliZZirtklHkv57r8WYsRbEjH+0 lhQuRgN7D458yGrJzMpXTbqCG9w2MQvYJeMQe9Tc= Date: Sun, 31 Dec 2023 14:17:33 +0100 Message-ID: <538fccb4a1bc4005b85b43a168873abea5e95d42.1704028653.git.w@wmeyer.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=95.216.196.112; envelope-from=w@wmeyer.eu; helo=mail.wmeyer.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches |
| Series |
[bug#68173] gnu: Add morris.
|
|
Commit Message
Wilko Meyer
Dec. 31, 2023, 1:17 p.m. UTC
* gnu/packages/games.scm (morris): New variable. Change-Id: I35158d1f5cfd5f7267dcb8295d8102e2dd3f575c --- gnu/packages/games.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) base-commit: f24b14767d362a84e6469682b4fe303b50f4b589 prerequisite-patch-id: b3c8c2f810e3581b22e34e6852353ebb505fa020
Comments
Am Sonntag, dem 31.12.2023 um 14:17 +0100 schrieb Wilko Meyer: > * gnu/packages/games.scm (morris): New variable. > > Change-Id: I35158d1f5cfd5f7267dcb8295d8102e2dd3f575c > --- Hi, this patch fails to apply both locally and on CI. Can you rebase this on your side and reroll? Cheers
Hi Liliana, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Sonntag, dem 31.12.2023 um 14:17 +0100 schrieb Wilko Meyer: >> * gnu/packages/games.scm (morris): New variable. >> >> Change-Id: I35158d1f5cfd5f7267dcb8295d8102e2dd3f575c >> --- > Hi, this patch fails to apply both locally and on CI. Can you rebase > this on your side and reroll? > > Cheers Thanks for getting back to this! While preparing to do so I noticed: (guix230 (~/devel/guix_proper)) λ git blame -L :morris gnu/packages/games.scm 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10509) (define-public morris 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10510) (package 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10511) (name "morris") 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10512) (version "0.3") 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10513) (source 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10514) (origin 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10515) (method git-fetch) 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10516) (uri (git-reference 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10517) (url "https://github.com/farindk/morris") 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10518) (commit (string-append "v" version)))) 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10519) (file-name (git-file-name name version)) 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10520) (sha256 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10521) (base32 "1kkcnpkzgybm7rqg7nafd7sqd5m4alns6l4j5zcf3p41jdc9s3iv")))) 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10522) (build-system glib-or-gtk-build-system) 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10523) (inputs (list automake autoconf pkg-config intltool 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10524) gnu-gettext libtool glib gtk+-2 boost)) 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10525) (arguments `(#:tests? #f)) 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10526) (home-page "http://nine-mens-morris.net/downloads.html") 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10527) (synopsis "Morris is an implementation of the board game Nine Men's Morris") 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10528) (description "Morris is an implementation of the board game Nine Men's Morris. 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10529) It supports not only the standard game, but also several rule-variants and different 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10530) board layouts. You can play against the computer, or simply use the program to 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10531) present the board, but play against another human opponent.") 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10532) (license license:gpl3))) 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10533) that the changes are already present and have been applied on master[0]. I guess rebasing and resending an already applied patch isn't feasible. Let me know if there's still work required on my side. [0]: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=11136fb0ad90937516ce0421a352e3a4513fca3b
Am Sonntag, dem 14.01.2024 um 13:46 +0100 schrieb Wilko Meyer: > > Hi Liliana, > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > > Am Sonntag, dem 31.12.2023 um 14:17 +0100 schrieb Wilko Meyer: > > > * gnu/packages/games.scm (morris): New variable. > > > > > > Change-Id: I35158d1f5cfd5f7267dcb8295d8102e2dd3f575c > > > --- > > Hi, this patch fails to apply both locally and on CI. Can you > > rebase this on your side and reroll? > > > > Cheers > > Thanks for getting back to this! While preparing to do so I noticed: > > (guix230 (~/devel/guix_proper)) λ git blame -L :morris > gnu/packages/games.scm > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10509) (define- > public morris > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10510) (package > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10511) (name > "morris") > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10512) > (version "0.3") > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10513) (source > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10514) > (origin > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10515) > (method git-fetch) > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10516) (uri > (git-reference > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 > 10517) (url "https://github.com/farindk/morris") > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 > 10518) (commit (string-append "v" version)))) > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10519) > (file-name (git-file-name name version)) > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10520) > (sha256 > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10521) > (base32 "1kkcnpkzgybm7rqg7nafd7sqd5m4alns6l4j5zcf3p41jdc9s3iv")))) > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10522) (build- > system glib-or-gtk-build-system) > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10523) (inputs > (list automake autoconf pkg-config intltool > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 > 10524) gnu-gettext libtool glib gtk+-2 boost)) > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10525) > (arguments `(#:tests? #f)) > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10526) (home- > page "http://nine-mens-morris.net/downloads.html") > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10527) > (synopsis "Morris is an implementation of the board game Nine Men's > Morris") > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10528) > (description "Morris is an implementation of the board game Nine > Men's Morris. > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10529) It supports > not only the standard game, but also several rule-variants and > different > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10530) board > layouts. You can play against the computer, or simply use the program > to > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10531) present the > board, but play against another human opponent.") > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10532) > (license license:gpl3))) > 11136fb0ad9 (Wilko Meyer 2023-12-31 14:17:33 +0100 10533) > > that the changes are already present and have been applied on > master[0]. I guess rebasing and resending an already applied patch > isn't feasible. Let me know if there's still work required on my > side. In that case, someone already pushed it without noticing the ML. Closing then. Cheers
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1e203af9d1d..fbca9b60815 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10446,6 +10446,31 @@ (define-public moonfish using any UCI engine and also to connect UCI engines to Lichess.") (license license:agpl3+)))) +(define-public morris + (package + (name "morris") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/farindk/morris") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kkcnpkzgybm7rqg7nafd7sqd5m4alns6l4j5zcf3p41jdc9s3iv")))) + (build-system glib-or-gtk-build-system) + (inputs (list automake autoconf pkg-config intltool + gnu-gettext libtool glib gtk+-2 boost)) + (arguments `(#:tests? #f)) + (home-page "http://nine-mens-morris.net/downloads.html") + (synopsis "Morris is an implementation of the board game Nine Men's Morris") + (description "Morris is an implementation of the board game Nine Men's Morris. +It supports not only the standard game, but also several rule-variants and different +board layouts. You can play against the computer, or simply use the program to +present the board, but play against another human opponent.") + (license license:gpl3))) + (define-public barrage (package (name "barrage")