all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: <pkill9@runbox.com>
To: Tobias Geerinckx-Rice <me@tobias.gr>
Cc: 34523 <34523@debbugs.gnu.org>
Subject: [bug#34523] Add tetrinet
Date: Tue, 19 Feb 2019 07:51:30 +0000 (GMT)	[thread overview]
Message-ID: <E1gw0Be-0006uJ-6i@rmmprod05.runbox> (raw)
In-Reply-To: <87va1hyyna.fsf@nckx>

[-- Attachment #1: Type: text/plain, Size: 2203 bytes --]

I've attached an updated patch with the modifications suggested so far:

 - Changed license from expat to public-domain
 - Changed "No tests" to lowercase "no tests"
 - Added "no configure file" comment
 - Install Readme files

I indent the package definition in emacs by marking the package definition (CTRL+Space) and running `M-x indent-region`, I'm not sure what indentation was wrong with the original patch I submitted, but I ran indent-region on it again anyway.

On Mon, 18 Feb 2019 15:11:37 +0100, Tobias Geerinckx-Rice <me@tobias.gr> wrote:

> pkill -9, Ricardo,
> 
> Ricardo Wurmus wrote:
> > pkill9@runbox.com writes:
> >> +     `(#:tests? #f ; No tests.
> 
> Only nitpicks:
> 
> +     `(#:tests? #f                      ; no tests
> 
> If you're using emacs, running C-M-q on the whole definition will 
> automatically indent your code.  There's a way to do the same 
> without emacs, but I forget how.
> 
> >> +       #:phases (modify-phases %standard-phases
> >> +                  (delete 'configure)
> 
> +                  (delete 'configure)   ; no configure script
> 
> >> +                  (add-after 'unpack 'fix-install-dir
> >> +                    (lambda* (#:key outputs 
> >> #:allow-other-keys)
> >> +                      (let ((out (assoc-ref outputs "out")))
> >> +                        (mkdir-p (string-append out "/bin"))
> >> +                        (substitute* "Makefile"
> >> +                          (("/usr/games") (string-append out 
> >> "/bin")))))))))
> >
> > Can this patching be avoided by passing a make flag instead?
> 
> Nope, it's hard-coded in the Makefile target :-(
> 
> Considering the lack of a man(ual) page, how about adding 
> something like:
> 
>   (add-after 'install 'install-documentation
>     (lambda* (#:key outputs #:allow-other-keys)
>       (let* ((out (assoc-ref outputs "out"))
>              (doc (string-append out "/share/doc/"
>                                  ,name "-" ,version)))
>         (for-each (lambda (file)
>                     (install-file file doc))
>                   (list "README" "tetrinet.txt"))
>         #t))))))
> 
> Thanks!
> 
> T G-R



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-tetrinet.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-tetrinet.patch", Size: 2737 bytes --]

From b82be816ed92afd3988ffdee1206edfe9a19616a Mon Sep 17 00:00:00 2001
From: Pkill -9 <pkill9@runbox.com>
Date: Tue, 19 Feb 2019 07:46:29 +0000
Subject: [PATCH] gnu: Add tetrinet.

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

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f82af0e8c..e6f7f7b79 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -36,6 +36,7 @@
 ;;; Copyright © 2018 Madalin Ionel-Patrascu <madalinionel.patrascu@mdc-berlin.de>
 ;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
 ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
+;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6102,3 +6103,44 @@ to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory.")
     (home-page "https://www.stepmania.com")
     (license license:expat)))
 
+(define-public tetrinet
+  (package
+    (name "tetrinet")
+    (version "0.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://tetrinet.or.cz/download/tetrinet-"
+             version
+             ".tar.bz2"))
+       (sha256
+        (base32
+         "0b4pddqz6is1771qmvcj8qqlr4in2djdbkk13agvp9yhfah2v8x7"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("ncurses" ,ncurses)))
+    (arguments
+     `(#:tests? #f ; no tests.
+       #:make-flags '("CC=gcc")
+       #:phases (modify-phases %standard-phases
+                  (delete 'configure) ; no configure script.
+                  (add-after 'unpack 'fix-install-dir
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out")))
+                        (mkdir-p (string-append out "/bin"))
+                        (substitute* "Makefile"
+                          (("/usr/games") (string-append out "/bin"))))))
+                  (add-after 'install 'install-documentation
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (doc (string-append out "/share/doc/" ,name "-" ,version)))
+                        (for-each (lambda (file)
+                                    (install-file file doc))
+                                  (list "README" "tetrinet.txt"))
+                        #t))))))
+    (home-page "http://tetrinet.or.cz")
+    (synopsis "Multiplayer tetris")
+    (description "Tetrinet is a multiplayer tetris game with powerups and
+attacks you can use on opponents.")
+    (license license:public-domain)))
-- 
2.20.1


  parent reply	other threads:[~2019-02-19  7:52 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-18  6:57 [bug#34523] Add tetrinet pkill9
2019-02-18 10:36 ` Ricardo Wurmus
2019-02-18 14:11   ` Tobias Geerinckx-Rice
2019-02-18 14:41     ` Danny Milosavljevic
2019-02-23  9:23       ` swedebugia
2019-02-19  7:51     ` pkill9 [this message]
2019-02-23  9:26       ` swedebugia
2019-02-23  6:23         ` swedebugia
2019-02-26 15:20           ` pkill9
2019-02-26 20:45             ` swedebugia
2019-02-27  7:10               ` pkill9
2021-08-06  3:20       ` bug#34523: " Maxim Cournoyer
2019-02-26 15:44 ` [bug#34523] " pkill9
2019-02-26 20:40   ` swedebugia
2019-02-27  7:01     ` pkill9
2019-02-27 14:11 ` pkill9
2019-02-28  4:03   ` swedebugia
2019-03-02 20:10     ` pkill9
2019-03-31 11:44     ` pkill9
2019-04-10 13:07 ` pkill9
2019-06-30  9:33 ` pkill9

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1gw0Be-0006uJ-6i@rmmprod05.runbox \
    --to=pkill9@runbox.com \
    --cc=34523@debbugs.gnu.org \
    --cc=me@tobias.gr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.