GNU bug report logs - #62262
[PATCH] Add xfishtank and xpenguins

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 62262 in the body.
You can then email your comments to 62262 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: Sarthak Shah <shahsarthakw <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] Add xfishtank and xpenguins
Date: Sat, 18 Mar 2023 16:27:03 +0000

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

Hi Guix,
This patch adds xfishtank and xpenguins to toys.scm which are programs
similar to xsnow by the same author.

* gnu/packages/toys.scm (xpenguins): New variable.
* gnu/packages/toys.scm (xfishtank): New variable.
---
 gnu/packages/toys.scm | 64 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm
index 8967c0c25b..16adf6d92a 100644
--- a/gnu/packages/toys.scm
+++ b/gnu/packages/toys.scm
@@ -397,6 +397,70 @@ (define-public xsnow
 and various scenery elements.")
     (license license:gpl3+)))

+(define-public xpenguins
+  (package
+    (name "xpenguins")
+    (version "3.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://ratrabbit.nl/downloads/xpenguins/xpenguins-"
+             version ".tar.gz"))
+       (sha256
+        (base32 "03qwc7gf21d2ixkrxxwwgayj6f5fv1kg4b7ggx90j5269il63adm"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'fix-install-path
+           (lambda _
+             ;; Install program to bin instead of games.
+             (substitute* "src/Makefile.in"
+               (("(gamesdir = \\$\\(exec_prefix\\)/)games" _ prefix)
+                (string-append prefix "bin")))
+             #t)))))
+    (inputs
+     (list gtk+ libx11 libxpm libxt libxml2))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://www.ratrabbit.nl/ratrabbit/xpenguins/index.html")
+    (synopsis "Let penguins take over your desktop!")
+    (description "@code{Xpenguins} is a vintage application for Unix
systems, showing penguins running, flying, falling etc. on the desktop,
using windows as run paths.")
+    (license license:gpl3+)))
+
+(define-public xfishtank
+  (package
+    (name "xfishtank")
+    (version "3.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+              "https://ratrabbit.nl/downloads/xfishtank/xfishtank-"
+             version ".tar.gz"))
+       (sha256
+        (base32 "0jbx41kdpgm3nrnrvfy9znkipd8xq0jj5plavcsjkhkva8ybc0ax"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'fix-install-path
+           (lambda _
+             ;; Install program to bin instead of games.
+             (substitute* "src/Makefile.in"
+               (("(gamesdir = \\$\\(exec_prefix\\)/)games" _ prefix)
+                (string-append prefix "bin")))
+             #t)))))
+    (inputs
+     (list gtk+ libx11 libxpm libxt libxml2))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://www.ratrabbit.nl/ratrabbit/xfishtank")
+    (synopsis "Let fishes swim over your desktop!")
+    (description "@code{Xfishtank} is a well-known vintage application for
Unix systems, based on the X11 protocol. It shows fishes swimming over the
desktop.")
+    (license license:gpl3+)))
+
 (define-public nyancat
   (package
     (name "nyancat")
-- 
2.39.1

[Message part 2 (text/html, inline)]

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

From: Greg Hogan <code <at> greghogan.com>
To: Sarthak Shah <shahsarthakw <at> gmail.com>
Cc: 62262 <at> debbugs.gnu.org
Subject: Re: [bug#62262] [PATCH] Add xfishtank and xpenguins
Date: Tue, 16 May 2023 14:26:02 -0400

On Sat, Mar 18, 2023 at 12:28 PM Sarthak Shah <shahsarthakw <at> gmail.com> wrote:
>
> Hi Guix,
> This patch adds xfishtank and xpenguins to toys.scm which are programs similar to xsnow by the same author.

The packages build and run as expected. This single patch should be
separated into a patch per package.

> * gnu/packages/toys.scm (xpenguins): New variable.
> * gnu/packages/toys.scm (xfishtank): New variable.
> ---
>  gnu/packages/toys.scm | 64 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 64 insertions(+)
>
> diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm
> index 8967c0c25b..16adf6d92a 100644
> --- a/gnu/packages/toys.scm
> +++ b/gnu/packages/toys.scm
> @@ -397,6 +397,70 @@ (define-public xsnow
>  and various scenery elements.")
>      (license license:gpl3+)))
>
> +(define-public xpenguins
> +  (package
> +    (name "xpenguins")
> +    (version "3.2.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://ratrabbit.nl/downloads/xpenguins/xpenguins-"
> +             version ".tar.gz"))
> +       (sha256
> +        (base32 "03qwc7gf21d2ixkrxxwwgayj6f5fv1kg4b7ggx90j5269il63adm"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     '(#:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'fix-install-path
> +           (lambda _
> +             ;; Install program to bin instead of games.
> +             (substitute* "src/Makefile.in"
> +               (("(gamesdir = \\$\\(exec_prefix\\)/)games" _ prefix)
> +                (string-append prefix "bin")))
> +             #t)))))

It was my understanding that there is no need to return true. Same below.

> +    (inputs
> +     (list gtk+ libx11 libxpm libxt libxml2))
> +    (native-inputs
> +     (list pkg-config))
> +    (home-page "https://www.ratrabbit.nl/ratrabbit/xpenguins/index.html")

I am getting redirected and the new URL looks to be
https://www.ratrabbit.nl/ratrabbit/software/xpenguins

> +    (synopsis "Let penguins take over your desktop!")
> +    (description "@code{Xpenguins} is a vintage application for Unix systems, showing penguins running, flying, falling etc. on the desktop, using windows as run paths.")
> +    (license license:gpl3+)))

I am finding gpl2+ in xpenguins-3.2.1/COPYING

> +
> +(define-public xfishtank
> +  (package
> +    (name "xfishtank")
> +    (version "3.1.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +              "https://ratrabbit.nl/downloads/xfishtank/xfishtank-"
> +             version ".tar.gz"))
> +       (sha256
> +        (base32 "0jbx41kdpgm3nrnrvfy9znkipd8xq0jj5plavcsjkhkva8ybc0ax"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     '(#:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'fix-install-path
> +           (lambda _
> +             ;; Install program to bin instead of games.
> +             (substitute* "src/Makefile.in"
> +               (("(gamesdir = \\$\\(exec_prefix\\)/)games" _ prefix)
> +                (string-append prefix "bin")))
> +             #t)))))
> +    (inputs
> +     (list gtk+ libx11 libxpm libxt libxml2))
> +    (native-inputs
> +     (list pkg-config))
> +    (home-page "https://www.ratrabbit.nl/ratrabbit/xfishtank")

Same issue with redirection, with the new URL
https://www.ratrabbit.nl/ratrabbit/software/xfishtank

> +    (synopsis "Let fishes swim over your desktop!")
> +    (description "@code{Xfishtank} is a well-known vintage application for Unix systems, based on the X11 protocol. It shows fishes swimming over the desktop.")
> +    (license license:gpl3+)))

COPYING is gpl3 but the files are MIT licensed.

> +
>  (define-public nyancat
>    (package
>      (name "nyancat")
> --
> 2.39.1
>

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

From: Greg Hogan <code <at> greghogan.com>
To: 62262 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH v2 0/2] Add xpenguins and xfishtank.
Date: Tue, 30 Jan 2024 18:55:57 +0000

Updated per my review in May, 2023.

Also, the home-page URLs have been updated.

Sarthak Shah (2):
  gnu: Add xpenguins.
  gnu: Add xfishtank.

 gnu/packages/toys.scm | 65 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)


base-commit: ce519c56d6cdc7d471a22f34935ff4f76a4c0a03
-- 
2.43.0

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

From: Greg Hogan <code <at> greghogan.com>
To: 62262 <at> debbugs.gnu.org
Cc: Sarthak Shah <shahsarthakw <at> gmail.com>
Subject: [PATCH v2 1/2] gnu: Add xpenguins.
Date: Tue, 30 Jan 2024 18:55:58 +0000

From: Sarthak Shah <shahsarthakw <at> gmail.com>

* gnu/packages/toys.scm (xpenguins): New variable.

Change-Id: I6262092da4d51abaca1d6f01ec2e3f27baca7a01
---
 gnu/packages/toys.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm
index c058e70dac..6fdc931ae6 100644
--- a/gnu/packages/toys.scm
+++ b/gnu/packages/toys.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2020 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2021 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2023 Sarthak Shah <shahsarthakw <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -399,6 +400,39 @@ (define-public xsnow
 and various scenery elements.")
     (license license:gpl3+)))
 
+(define-public xpenguins
+  (package
+    (name "xpenguins")
+    (version "3.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://ratrabbit.nl/downloads/xpenguins/xpenguins-"
+             version ".tar.gz"))
+       (sha256
+        (base32 "03qwc7gf21d2ixkrxxwwgayj6f5fv1kg4b7ggx90j5269il63adm"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'fix-install-path
+           (lambda _
+             ;; Install program to bin instead of games.
+             (substitute* "src/Makefile.in"
+               (("(gamesdir = \\$\\(exec_prefix\\)/)games" _ prefix)
+                (string-append prefix "bin"))))))))
+    (inputs
+     (list gtk+ libx11 libxpm libxt libxml2))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://www.ratrabbit.nl/ratrabbit/software/xpenguins/index.html")
+    (synopsis "Let penguins take over your desktop!")
+    (description "@code{Xpenguins} is a vintage application for Unix systems,
+showing penguins running, flying, falling etc. on the desktop, using windows as
+run paths.")
+    (license license:gpl2+)))
+
 (define-public nyancat
   (package
     (name "nyancat")
-- 
2.43.0

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

From: Greg Hogan <code <at> greghogan.com>
To: 62262 <at> debbugs.gnu.org
Cc: Sarthak Shah <shahsarthakw <at> gmail.com>
Subject: [PATCH v2 2/2] gnu: Add xfishtank.
Date: Tue, 30 Jan 2024 18:55:59 +0000

From: Sarthak Shah <shahsarthakw <at> gmail.com>

* gnu/packages/toys.scm (xfishtank): New variable.

Change-Id: I490fba2d9ded274266d6376adf67c39bf5c9744a
---
 gnu/packages/toys.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm
index 6fdc931ae6..caefce0c68 100644
--- a/gnu/packages/toys.scm
+++ b/gnu/packages/toys.scm
@@ -433,6 +433,38 @@ (define-public xpenguins
 run paths.")
     (license license:gpl2+)))
 
+(define-public xfishtank
+  (package
+    (name "xfishtank")
+    (version "3.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+              "https://ratrabbit.nl/downloads/xfishtank/xfishtank-"
+             version ".tar.gz"))
+       (sha256
+        (base32 "0jbx41kdpgm3nrnrvfy9znkipd8xq0jj5plavcsjkhkva8ybc0ax"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'fix-install-path
+           (lambda _
+             ;; Install program to bin instead of games.
+             (substitute* "src/Makefile.in"
+               (("(gamesdir = \\$\\(exec_prefix\\)/)games" _ prefix)
+                (string-append prefix "bin"))))))))
+    (inputs
+     (list gtk+ libx11 libxpm libxt libxml2))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://www.ratrabbit.nl/ratrabbit/software/xfishtank/index.html")
+    (synopsis "Let fish swim over your desktop!")
+    (description "@code{Xfishtank} is a well-known vintage application for Unix
+systems, based on the X11 protocol. It shows fish swimming over the desktop.")
+    (license (list license:expat license:gpl3+))))
+
 (define-public nyancat
   (package
     (name "nyancat")
-- 
2.43.0

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

From: Steve George <steve <at> futurile.net>
To: 62262 <at> debbugs.gnu.org
Cc: Steve George <steve <at> futurile.net>, guix-patches <at> gnu.org
Subject: [PATCH v3 0/2] Add xfishtank and xpenguins
Date: Sat, 17 Feb 2024 17:12:17 +0000

Review:
  * Updated xfishtank to latest upstream 3.2.1
  * Added Reviewed-by commit trailers (Greg / Steve)
  * Applied patches, test installed, linted
  * Re-roll to trigger QA build

Sarthak Shah (2):
  gnu: Add xpenguins.
  gnu: Add xfishtank.


 gnu/packages/toys.scm | 69 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)


base-commit: 06014750338159a03a6374d7ebdd783c210b3715
-- 
2.41.0

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

From: Steve George <steve <at> futurile.net>
To: 62262 <at> debbugs.gnu.org
Cc: Steve George <steve <at> futurile.net>, Sarthak Shah <shahsarthakw <at> gmail.com>,
 guix-patches <at> gnu.org, Greg Hogan <code <at> greghogan.com>
Subject: [PATCH v3 1/2] gnu: Add xpenguins.
Date: Sat, 17 Feb 2024 17:12:18 +0000

From: Sarthak Shah <shahsarthakw <at> gmail.com>

* gnu/packages/toys.scm (xpenguins): New variable.

Reviewed-by: Greg Hogan <code <at> greghogan.com>
Reviewed-by: Steve George <steve <at> futurile.net>

Change-Id: I6262092da4d51abaca1d6f01ec2e3f27baca7a01
---
 gnu/packages/toys.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm
index c058e70dac9..6fdc931ae66 100644
--- a/gnu/packages/toys.scm
+++ b/gnu/packages/toys.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2020 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2021 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2023 Sarthak Shah <shahsarthakw <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -399,6 +400,39 @@ (define-public xsnow
 and various scenery elements.")
     (license license:gpl3+)))
 
+(define-public xpenguins
+  (package
+    (name "xpenguins")
+    (version "3.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://ratrabbit.nl/downloads/xpenguins/xpenguins-"
+             version ".tar.gz"))
+       (sha256
+        (base32 "03qwc7gf21d2ixkrxxwwgayj6f5fv1kg4b7ggx90j5269il63adm"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'fix-install-path
+           (lambda _
+             ;; Install program to bin instead of games.
+             (substitute* "src/Makefile.in"
+               (("(gamesdir = \\$\\(exec_prefix\\)/)games" _ prefix)
+                (string-append prefix "bin"))))))))
+    (inputs
+     (list gtk+ libx11 libxpm libxt libxml2))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://www.ratrabbit.nl/ratrabbit/software/xpenguins/index.html")
+    (synopsis "Let penguins take over your desktop!")
+    (description "@code{Xpenguins} is a vintage application for Unix systems,
+showing penguins running, flying, falling etc. on the desktop, using windows as
+run paths.")
+    (license license:gpl2+)))
+
 (define-public nyancat
   (package
     (name "nyancat")
-- 
2.41.0

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

From: Steve George <steve <at> futurile.net>
To: 62262 <at> debbugs.gnu.org
Cc: Steve George <steve <at> futurile.net>, Sarthak Shah <shahsarthakw <at> gmail.com>,
 guix-patches <at> gnu.org, Greg Hogan <code <at> greghogan.com>
Subject: [PATCH v3 2/2] gnu: Add xfishtank.
Date: Sat, 17 Feb 2024 17:12:19 +0000

From: Sarthak Shah <shahsarthakw <at> gmail.com>

* gnu/packages/toys.scm (xfishtank): New variable.

Reviewed-by: Greg Hogan <code <at> greghogan.com>
Reviewed-by: Steve George <steve <at> futurile.net>

Change-Id: I490fba2d9ded274266d6376adf67c39bf5c9744a
---
 gnu/packages/toys.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm
index 6fdc931ae66..072b6200dad 100644
--- a/gnu/packages/toys.scm
+++ b/gnu/packages/toys.scm
@@ -433,6 +433,41 @@ (define-public xpenguins
 run paths.")
     (license license:gpl2+)))
 
+(define-public xfishtank
+  (package
+    (name "xfishtank")
+    (version "3.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+              "https://www.ratrabbit.nl/downloads/xfishtank/xfishtank-"
+              version "~pre1.tar.gz"))
+       ;; version has ~pre1 in it. Guix store does not allow tilde
+       ;; in file names. Save it in the Store using a hyphen
+       (file-name (string-append name "-" version "-pre1.tar.gz"))
+       (sha256
+        (base32 "16i9diawkmar6dhx5xn0mflr2h585gamab6137hvxzgaczx55lwp"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'fix-install-path
+           (lambda _
+             ;; Install program to bin instead of games.
+             (substitute* "src/Makefile.in"
+               (("(gamesdir = \\$\\(exec_prefix\\)/)games" _ prefix)
+                (string-append prefix "bin"))))))))
+    (inputs
+     (list gtk+ libx11 libxpm libxt libxml2))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://www.ratrabbit.nl/ratrabbit/software/xfishtank/index.html")
+    (synopsis "Let fish swim over your desktop!")
+    (description "@code{Xfishtank} is a well-known vintage application for Unix
+systems, that uses the X11 protocol.  It shows fish swimming over the desktop.")
+    (license (list license:expat license:gpl3+))))
+
 (define-public nyancat
   (package
     (name "nyancat")
-- 
2.41.0

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

From: Steve George <steve <at> futurile.net>
To: 62262 <at> debbugs.gnu.org
Subject: Set usertag reviewed-looks-good
Date: Sun, 18 Feb 2024 12:25:49 +0000

usertag 62262 reviewed-looks-good
quit

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

From: Clément Lassieur <clement <at> lassieur.org>
To: Steve George <steve <at> futurile.net>
Cc: 62262 <at> debbugs.gnu.org
Subject: Re: [bug#62262] Set usertag reviewed-looks-good
Date: Tue, 20 Feb 2024 01:07:07 +0100

Hi Steve,

My understanding is that you should write

    user guix

before the usertag line, so that it is associated with the 'guix' user.

https://guix.gnu.org/manual/en/html_node/Debbugs-Usertags.html

On Sun, Feb 18 2024, Steve George wrote:

> usertag 62262 reviewed-looks-good
> quit

Cheers

Clément

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

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Steve George <steve <at> futurile.net>
Cc: 62262-done <at> debbugs.gnu.org
Subject: Re: [bug#62262] [PATCH v3 0/2] Add xfishtank and xpenguins
Date: Thu, 22 Feb 2024 20:48:16 +0100

Hello,

Steve George <steve <at> futurile.net> writes:

>   * Updated xfishtank to latest upstream 3.2.1
>   * Added Reviewed-by commit trailers (Greg / Steve)
>   * Applied patches, test installed, linted
>   * Re-roll to trigger QA build

I slightly tweaked the descriptions and applied your patches.

Thank you!

Regards,
-- 
Nicolas Goaziou

Previous Next

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