GNU bug report logs - #25695
angband [new package]

Previous Next

Package: guix-patches;

Reported by: Christopher Allan Webber <cwebber <at> dustycloud.org>

Date: Sun, 12 Feb 2017 14:02:02 UTC

Severity: normal

Tags: patch

Done: Christopher Allan Webber <cwebber <at> dustycloud.org>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#25695; Package guix-patches. (Sun, 12 Feb 2017 14:02:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Christopher Allan Webber <cwebber <at> dustycloud.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sun, 12 Feb 2017 14:02:02 GMT) Full text and rfc822 format available.

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

From: Christopher Allan Webber <cwebber <at> dustycloud.org>
To: guix-patches <at> gnu.org
Subject: angband [new package]
Date: Sun, 12 Feb 2017 08:00:46 -0600
[Message part 1 (text/plain, inline)]
This patch adds Angband, one of those delightfully life-destroying
roguelikes.  Now you too can ruin your life chasing an @ around a screen
for hours at a time.  Horray!

[0001-gnu-Add-angband.patch (text/x-patch, inline)]
From c167b96d38acf580e42a618b6211c007760949f0 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber <at> dustycloud.org>
Date: Fri, 10 Feb 2017 16:45:11 -0600
Subject: [PATCH] gnu: Add angband.

* gnu/packages/games.scm (angband): New variable.
---
 gnu/packages/games.scm | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 0867089d5..0df1f69e5 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw <at> netris.org>
 ;;; Copyright © 2015, 2016 Andreas Enge <andreas <at> enge.fr>
 ;;; Copyright © 2015 David Hashe <david.hashe <at> dhashe.com>
-;;; Copyright © 2015 Christopher Allan Webber <cwebber <at> dustycloud.org>
+;;; Copyright © 2015, 2017 Christopher Allan Webber <cwebber <at> dustycloud.org>
 ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2015, 2016, 2017 Alex Kost <alezost <at> gmail.com>
 ;;; Copyright © 2015 Paul van der Walt <paul <at> denknerd.org>
@@ -227,6 +227,41 @@ them, called Jean Raymond, found an old church in which to hide, not knowing
 that beneath its ruins lay buried an ancient evil.")
     (license license:gpl3)))
 
+(define-public angband
+  (package
+    (name "angband")
+    (version "4.0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://rephial.org/downloads/4.0/"
+                           "angband-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0lpq2kms7hp421vrasx2bkkn9w08kr581ldwik3v0hlq6h7rlxhd"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f                                 ;no check target
+       ;; #:configure-flags '("--enable-sdl")
+       #:configure-flags (list (string-append "--bindir=" %output "/bin"))
+       #:phases (modify-phases %standard-phases
+                  (add-after
+                   'unpack 'autogen.sh
+                   (lambda _
+                     (substitute* "acinclude.m4"
+                       (("ncursesw5-config") "ncursesw6-config"))
+                     (zero? (system* "sh" "autogen.sh"))))))) 
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)))
+    (inputs `(("ncurses" ,ncurses)))
+    (home-page "http://rephial.org/")
+    (synopsis "Dungeon exploration roguelike")
+    (description "Classic dungeon exploration roguelike.  Explore the depths
+below Angband, seeking riches, fighting monsters, and preparing to fight
+Morgoth, the Lord of Darkness.")
+    (license license:gpl2)))
+
 (define-public pingus
   (package
     (name "pingus")
-- 
2.11.0

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

Added tag(s) patch. Request was from Christopher Allan Webber <cwebber <at> dustycloud.org> to control <at> debbugs.gnu.org. (Sun, 12 Feb 2017 15:56:03 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#25695; Package guix-patches. (Sun, 12 Feb 2017 17:40:01 GMT) Full text and rfc822 format available.

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

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Christopher Allan Webber <cwebber <at> dustycloud.org>
Cc: 25695 <at> debbugs.gnu.org
Subject: Re: bug#25695: angband [new package] 
Date: Sun, 12 Feb 2017 18:39:43 +0100
Christopher Allan Webber <cwebber <at> dustycloud.org> writes:

> This patch adds Angband, one of those delightfully life-destroying
> roguelikes.  Now you too can ruin your life chasing an @ around a screen
> for hours at a time.  Horray!

Neat!

> From c167b96d38acf580e42a618b6211c007760949f0 Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber <cwebber <at> dustycloud.org>
> Date: Fri, 10 Feb 2017 16:45:11 -0600
> Subject: [PATCH] gnu: Add angband.
>
> * gnu/packages/games.scm (angband): New variable.
> ---
>  gnu/packages/games.scm | 37 ++++++++++++++++++++++++++++++++++++-
>  1 file changed, 36 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 0867089d5..0df1f69e5 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -10,7 +10,7 @@
>  ;;; Copyright © 2014, 2015 Mark H Weaver <mhw <at> netris.org>
>  ;;; Copyright © 2015, 2016 Andreas Enge <andreas <at> enge.fr>
>  ;;; Copyright © 2015 David Hashe <david.hashe <at> dhashe.com>
> -;;; Copyright © 2015 Christopher Allan Webber <cwebber <at> dustycloud.org>
> +;;; Copyright © 2015, 2017 Christopher Allan Webber <cwebber <at> dustycloud.org>
>  ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado <at> elephly.net>
>  ;;; Copyright © 2015, 2016, 2017 Alex Kost <alezost <at> gmail.com>
>  ;;; Copyright © 2015 Paul van der Walt <paul <at> denknerd.org>
> @@ -227,6 +227,41 @@ them, called Jean Raymond, found an old church in which to hide, not knowing
>  that beneath its ruins lay buried an ancient evil.")
>      (license license:gpl3)))
>  
> +(define-public angband
> +  (package
> +    (name "angband")
> +    (version "4.0.5")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "http://rephial.org/downloads/4.0/"
> +                           "angband-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0lpq2kms7hp421vrasx2bkkn9w08kr581ldwik3v0hlq6h7rlxhd"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:tests? #f                                 ;no check target
> +       ;; #:configure-flags '("--enable-sdl")
> +       #:configure-flags (list (string-append "--bindir=" %output "/bin"))

Did you leave the commented entry for #:configure-flags on purpose?  If
that’s a TODO or FIXME I’d prefer if it was made explicit.

> +       #:phases (modify-phases %standard-phases
> +                  (add-after
> +                   'unpack 'autogen.sh

Nitpick: move the phase names onto the same line as “add-after”.

> +                   (lambda _
> +                     (substitute* "acinclude.m4"
> +                       (("ncursesw5-config") "ncursesw6-config"))
> +                     (zero? (system* "sh" "autogen.sh")))))))
> +    (native-inputs
> +     `(("autoconf" ,autoconf)
> +       ("automake" ,automake)))
> +    (inputs `(("ncurses" ,ncurses)))
> +    (home-page "http://rephial.org/")
> +    (synopsis "Dungeon exploration roguelike")
> +    (description "Classic dungeon exploration roguelike.  Explore the depths
> +below Angband, seeking riches, fighting monsters, and preparing to fight
> +Morgoth, the Lord of Darkness.")

Please turn the first sentence fragment into a full sentence?

> +    (license license:gpl2)))

Would it be better to add that the sounds and graphics are under
different licenses?

“copying.txt” says:

--8<---------------cut here---------------start------------->8---
 * Adam Bolt's (16x16) graphics may be redistributed and used for any purpose, 
   with or without modification.

 * David Gervais' (32x32) graphics may be redistributed, modified, and used
   only under the terms of the Creative Commons Attribution 3.0 licence:
   http://creativecommons.org/licenses/by/3.0/

 * Shockbolt's (64x64) graphics are distributed under the licence at the end
   of this file.  Currently some of the tiles in the 64x64.png tilesheet were
   resized from tiles made by David Gervais for the 32x32 set.

 * The sounds are licenced under the Creative Commons Attribution-NonCommercial-
   Sharealike licence.  They were created by Dubtrain <angband <at> dubtrain.com>.
   You can find them in Wave format at http://www.dubtrain.com/angband/.
--8<---------------cut here---------------end--------------->8---

-- 
Ricardo

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





Information forwarded to guix-patches <at> gnu.org:
bug#25695; Package guix-patches. (Sun, 12 Feb 2017 18:44:01 GMT) Full text and rfc822 format available.

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

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Christopher Allan Webber <cwebber <at> dustycloud.org>
Cc: 25695 <at> debbugs.gnu.org
Subject: Re: bug#25695: angband [new package]
Date: Sun, 12 Feb 2017 19:42:52 +0100
Christopher Allan Webber <cwebber <at> dustycloud.org> writes:

>>> +       #:phases (modify-phases %standard-phases
>>> +                  (add-after
>>> +                   'unpack 'autogen.sh
>>
>> Nitpick: move the phase names onto the same line as “add-after”.
>
> Hm, okay, I can do that, but I didn't do it for a reason... emacs
> an indentation style reason!
[…]
>
> Maybe we should put something in Guix's .dir-locals?
>

Do you have “guix-devel-mode” enabled?  It indents the expression just
fine in my Emacs (though I’d add a line break after “#:phases”).

>> “copying.txt” says:
>>
>>  * Adam Bolt's (16x16) graphics may be redistributed and used for any purpose,
>>    with or without modification.
>>
>>  * David Gervais' (32x32) graphics may be redistributed, modified, and used
>>    only under the terms of the Creative Commons Attribution 3.0 licence:
>>    http://creativecommons.org/licenses/by/3.0/
>>
>>  * Shockbolt's (64x64) graphics are distributed under the licence at the end
>>    of this file.  Currently some of the tiles in the 64x64.png tilesheet were
>>    resized from tiles made by David Gervais for the 32x32 set.
>>
>>  * The sounds are licenced under the Creative Commons Attribution-NonCommercial-
>>    Sharealike licence.  They were created by Dubtrain <angband <at> dubtrain.com>.
>>    You can find them in Wave format at http://www.dubtrain.com/angband/.
>
> Hmm, that last one is a problem because I think it doesn't meet our
> licensing requirements.  It's a bit funny because we aren't using the
> graphics or sounds anyway since this is a console-only version of this
> package.  So!  Easy solution: I added a phase that just deleted them all
> from the output.  Problem solved!  (Until someone adds a graphical
> variant.  Then they can deal with it ;))

Could you remove the sounds in a snippet instead?  This ensures that we
don’t redistribute them as part of the source tarball either.

I think it’s okay to push with that change.  Thanks!

--
Ricardo

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





Information forwarded to guix-patches <at> gnu.org:
bug#25695; Package guix-patches. (Sun, 12 Feb 2017 19:54:01 GMT) Full text and rfc822 format available.

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

From: Christopher Allan Webber <cwebber <at> dustycloud.org>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: 25695 <at> debbugs.gnu.org
Subject: Re: bug#25695: angband [new package]
Date: Sun, 12 Feb 2017 13:53:29 -0600
Ricardo Wurmus writes:

> Christopher Allan Webber <cwebber <at> dustycloud.org> writes:
>
>>>> +       #:phases (modify-phases %standard-phases
>>>> +                  (add-after
>>>> +                   'unpack 'autogen.sh
>>>
>>> Nitpick: move the phase names onto the same line as “add-after”.
>>
>> Hm, okay, I can do that, but I didn't do it for a reason... emacs
>> an indentation style reason!
> […]
>>
>> Maybe we should put something in Guix's .dir-locals?
>>
>
> Do you have “guix-devel-mode” enabled?  It indents the expression just
> fine in my Emacs (though I’d add a line break after “#:phases”).

I didn't even know such a thing existed.  Cool!

>>> “copying.txt” says:
>>>
>>>  * Adam Bolt's (16x16) graphics may be redistributed and used for any purpose,
>>>    with or without modification.
>>>
>>>  * David Gervais' (32x32) graphics may be redistributed, modified, and used
>>>    only under the terms of the Creative Commons Attribution 3.0 licence:
>>>    http://creativecommons.org/licenses/by/3.0/
>>>
>>>  * Shockbolt's (64x64) graphics are distributed under the licence at the end
>>>    of this file.  Currently some of the tiles in the 64x64.png tilesheet were
>>>    resized from tiles made by David Gervais for the 32x32 set.
>>>
>>>  * The sounds are licenced under the Creative Commons Attribution-NonCommercial-
>>>    Sharealike licence.  They were created by Dubtrain <angband <at> dubtrain.com>.
>>>    You can find them in Wave format at http://www.dubtrain.com/angband/.
>>
>> Hmm, that last one is a problem because I think it doesn't meet our
>> licensing requirements.  It's a bit funny because we aren't using the
>> graphics or sounds anyway since this is a console-only version of this
>> package.  So!  Easy solution: I added a phase that just deleted them all
>> from the output.  Problem solved!  (Until someone adds a graphical
>> variant.  Then they can deal with it ;))
>
> Could you remove the sounds in a snippet instead?  This ensures that we
> don’t redistribute them as part of the source tarball either.
>
> I think it’s okay to push with that change.  Thanks!

I didn't know about snippets either. :)

Okay, done!  Pushed up!  For all the productivity risks that might
entail...! :)




bug closed, send any further explanations to 25695 <at> debbugs.gnu.org and Christopher Allan Webber <cwebber <at> dustycloud.org> Request was from Christopher Allan Webber <cwebber <at> dustycloud.org> to control <at> debbugs.gnu.org. (Sun, 12 Feb 2017 19:56:02 GMT) Full text and rfc822 format available.

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Mon, 13 Mar 2017 11:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 8 years and 104 days ago.

Previous Next


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