Subject: Re: [bug#68173] [PATCH] gnu: Add morris.

From: Wilko Meyer <[email-masked]>
Date: Sun, 14 Jan 2024 13:46:59 +0100

Hi Liliana,

Liliana Marie Prikler <[email-masked]> 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

-- 
Kind regards,

Wilko Meyer
[email-masked]