GNU bug report logs - #26472
[PATCH] gnu: Add fillets-ng.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 26472 in the body.
You can then email your comments to 26472 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: guix-patches <at> gnu.org
Cc: Ricardo Wurmus <rekado <at> elephly.net>
Subject: [PATCH] gnu: Add fillets-ng.
Date: Thu, 13 Apr 2017 09:11:28 +0200

* gnu/packages/games.scm (fillets-ng): New variable.
---
 gnu/packages/games.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index a956f0ca4..c71278509 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3738,3 +3738,72 @@ settings.link.libs:Add(\"wavpack\")\n"))
 16 players in a variety of game modes, including Team Deathmatch and Capture
 The Flag.  You can even design your own maps!")
     (license license:bsd-3)))
+
+(define-public fillets-ng
+  (package
+    (name "fillets-ng")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/fillets/"
+                                  "Fish%20Fillets%20-%20Next%20Generation/"
+                                  version "/fillets-ng-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1nljp75aqqb35qq3x7abhs2kp69vjcj0h1vxcpdyn2yn2nalv6ij"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--with-lua="
+                            (assoc-ref %build-inputs "lua")))
+       #:make-flags
+       (list (string-append "CFLAGS=-I"
+                            (assoc-ref %build-inputs "sdl-union")
+                            "/include/SDL")
+             (string-append "CXXFLAGS=-I"
+                            (assoc-ref %build-inputs "sdl-union")
+                            "/include/SDL"))
+       #:phases
+       (modify-phases %standard-phases
+         ;; Lua 5.1 does not provide it.
+         (add-after 'unpack 'do-not-link-with-lualib
+           (lambda _
+             (substitute* "configure"
+               (("-llualib") ""))
+             #t))
+         (add-after 'install 'install-data
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((data (string-append (assoc-ref outputs "out")
+                                        "/share/games/fillets-ng")))
+               (mkdir-p data)
+               (zero? (system* "tar" "-xvf"
+                               (assoc-ref inputs "fillets-ng-data")
+                               "--strip-components=1"
+                               "-C" data))))))))
+    (inputs
+     `(("sdl-union" ,(sdl-union (list sdl
+                                      sdl-mixer
+                                      sdl-image
+                                      sdl-ttf)))
+       ("fribidi" ,fribidi)
+       ("libx11" ,libx11)
+       ("lua" ,lua-5.1)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("fillets-ng-data"
+        ,(origin
+           (method url-fetch)
+           (uri (string-append "mirror://sourceforge/fillets/"
+                               "Fish%20Fillets%20-%20Next%20Generation/"
+                               version "/fillets-ng-data-" version ".tar.gz"))
+           (sha256
+            (base32
+             "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh"))))))
+    (home-page "http://fillets.sourceforge.net/")
+    (synopsis "Puzzle game")
+    (description "Fish Fillets NG is strictly a puzzle game.  The goal in
+every of the seventy levels is always the same: find a safe way out.  The fish
+utter witty remarks about their surroundings, the various inhabitants of their
+underwater realm quarrel among themselves or comment on the efforts of your
+fish.  The whole game is accompanied by quiet, comforting music.")
+    (license license:gpl2+)))
-- 
2.12.2

Message #8 received at 26472 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Ricardo Wurmus <rekado <at> elephly.net>, 26472 <at> debbugs.gnu.org
Cc: Ricardo Wurmus <rekado <at> elephly.net>
Subject: Re: bug#26472: [PATCH] gnu: Add fillets-ng.
Date: Thu, 13 Apr 2017 21:32:39 +0200

[Message part 1 (text/plain, inline)]

Ricardo Wurmus <rekado <at> elephly.net> writes:

> * gnu/packages/games.scm (fillets-ng): New variable.

Great job submitting these just in time for easter :)

> ---
>  gnu/packages/games.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 69 insertions(+)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index a956f0ca4..c71278509 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -3738,3 +3738,72 @@ settings.link.libs:Add(\"wavpack\")\n"))
>  16 players in a variety of game modes, including Team Deathmatch and Capture
>  The Flag.  You can even design your own maps!")
>      (license license:bsd-3)))
> +
> +(define-public fillets-ng
> +  (package
> +    (name "fillets-ng")
> +    (version "1.0.1")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "mirror://sourceforge/fillets/"
> +                                  "Fish%20Fillets%20-%20Next%20Generation/"
> +                                  version "/fillets-ng-" version ".tar.gz"))

I would mention "fillets-ng-data" somewhere around this general area, so
it isn't forgotten when someone comes here to update it. Looks good
otherwise.

> +              (sha256
> +               (base32
> +                "1nljp75aqqb35qq3x7abhs2kp69vjcj0h1vxcpdyn2yn2nalv6ij"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:configure-flags
> +       (list (string-append "--with-lua="
> +                            (assoc-ref %build-inputs "lua")))
> +       #:make-flags
> +       (list (string-append "CFLAGS=-I"
> +                            (assoc-ref %build-inputs "sdl-union")
> +                            "/include/SDL")
> +             (string-append "CXXFLAGS=-I"
> +                            (assoc-ref %build-inputs "sdl-union")
> +                            "/include/SDL"))
> +       #:phases
> +       (modify-phases %standard-phases
> +         ;; Lua 5.1 does not provide it.
> +         (add-after 'unpack 'do-not-link-with-lualib
> +           (lambda _
> +             (substitute* "configure"
> +               (("-llualib") ""))
> +             #t))
> +         (add-after 'install 'install-data
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (let ((data (string-append (assoc-ref outputs "out")
> +                                        "/share/games/fillets-ng")))
> +               (mkdir-p data)
> +               (zero? (system* "tar" "-xvf"
> +                               (assoc-ref inputs "fillets-ng-data")
> +                               "--strip-components=1"
> +                               "-C" data))))))))
> +    (inputs
> +     `(("sdl-union" ,(sdl-union (list sdl
> +                                      sdl-mixer
> +                                      sdl-image
> +                                      sdl-ttf)))
> +       ("fribidi" ,fribidi)
> +       ("libx11" ,libx11)
> +       ("lua" ,lua-5.1)))
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)
> +       ("fillets-ng-data"
> +        ,(origin
> +           (method url-fetch)
> +           (uri (string-append "mirror://sourceforge/fillets/"
> +                               "Fish%20Fillets%20-%20Next%20Generation/"
> +                               version "/fillets-ng-data-" version ".tar.gz"))
> +           (sha256
> +            (base32
> +             "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh"))))))
> +    (home-page "http://fillets.sourceforge.net/")
> +    (synopsis "Puzzle game")
> +    (description "Fish Fillets NG is strictly a puzzle game.  The goal in
> +every of the seventy levels is always the same: find a safe way out.  The fish
> +utter witty remarks about their surroundings, the various inhabitants of their
> +underwater realm quarrel among themselves or comment on the efforts of your
> +fish.  The whole game is accompanied by quiet, comforting music.")
> +    (license license:gpl2+)))
> -- 
> 2.12.2

[signature.asc (application/pgp-signature, inline)]

Message #13 received at 26472-done <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 26472-done <at> debbugs.gnu.org
Subject: Re: bug#26472: [PATCH] gnu: Add fillets-ng.
Date: Thu, 13 Apr 2017 23:40:25 +0200

Marius Bakke <mbakke <at> fastmail.com> writes:

>> +(define-public fillets-ng
>> +  (package
>> +    (name "fillets-ng")
>> +    (version "1.0.1")
>> +    (source (origin
>> +              (method url-fetch)
>> +              (uri (string-append "mirror://sourceforge/fillets/"
>> +                                  "Fish%20Fillets%20-%20Next%20Generation/"
>> +                                  version "/fillets-ng-" version ".tar.gz"))
>
> I would mention "fillets-ng-data" somewhere around this general area, so
> it isn't forgotten when someone comes here to update it. Looks good
> otherwise.

I forgot about adding the comment and pushed it to master with commit
e02f16636461985199b729f975ca6d57ac3cdd53.

I hope it’s clear to people who update this package that they should
also make sure that the data package matches.  I guess they’ll notice
anyway when they change the version string and the hash for
the “fillets-ng-data” input is wrong.

Thanks for the review!

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.