From patchwork Tue Feb 19 07:51:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pkill9 X-Patchwork-Id: 1192 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EBA4616C62; Tue, 19 Feb 2019 07:52:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6F0F516C00 for ; Tue, 19 Feb 2019 07:52:13 +0000 (GMT) Received: from localhost ([127.0.0.1]:43620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gw0CL-0007KE-30 for patchwork@mira.cbaines.net; Tue, 19 Feb 2019 02:52:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gw0CE-0007Jv-GZ for guix-patches@gnu.org; Tue, 19 Feb 2019 02:52:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gw0CB-0000BL-26 for guix-patches@gnu.org; Tue, 19 Feb 2019 02:52:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gw0CA-0000BE-IA for guix-patches@gnu.org; Tue, 19 Feb 2019 02:52:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gw0CA-0007sl-CK for guix-patches@gnu.org; Tue, 19 Feb 2019 02:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34523] Add tetrinet References: Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Feb 2019 07:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34523 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: "Tobias Geerinckx-Rice" Received: via spool by 34523-submit@debbugs.gnu.org id=B34523.155056270230271 (code B ref 34523); Tue, 19 Feb 2019 07:52:02 +0000 Received: (at 34523) by debbugs.gnu.org; 19 Feb 2019 07:51:42 +0000 Received: from localhost ([127.0.0.1]:53791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gw0Bm-0007s6-II for submit@debbugs.gnu.org; Tue, 19 Feb 2019 02:51:42 -0500 Received: from aibo.runbox.com ([91.220.196.211]:45944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gw0Bj-0007ru-K7 for 34523@debbugs.gnu.org; Tue, 19 Feb 2019 02:51:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=rbselector1; h=Message-Id:Content-Type:In-Reply-To:Date:Subject:CC:To:From :MIME-Version; bh=2v2kJ2zLo9xHIFaOO3hXxme/kfDdk1iM2kdimFIYvhc=; b=Nvkf4aEGBOf /0bs2XziEp965R9jSKtvsf6T5q7ULa5BX20sjRSm8L3PcZN1vm02DOhbNxn13KcH8SxOHv6/OkMcK rAOwfg4Ze70d8gciGWn5uG/l8LUsx+aZNkXpwPFmW4UlBQ+wTz9dYj4UXKIjfF+e2VsN+BsGjflup jVcwnklLvJ2jil7g/CS7sfmxhaTUtgdiPI+IVDK+ruFImdFk6r5kjI6FlxS1Y3EdOBmkXE0VM3XAg jdoUQjmzoMib0WLwwGuHlG/nebdusKCaxC13852VKtwS3r6iz8ddI6FcXbMtbQMifntnIsBUwH8cB uSrn+0a0FkLAsH1i0W0jF/w==; Received: from [10.9.9.127] (helo=rmmprod05.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1gw0Be-0006Tf-7f; Tue, 19 Feb 2019 08:51:30 +0100 Received: from mail by rmmprod05.runbox with local (Exim 4.86_2) (envelope-from ) id 1gw0Be-0006uJ-6i; Tue, 19 Feb 2019 08:51:30 +0100 MIME-Version: 1.0 Received: from [Authenticated user (850733)] by runbox.com with http (RMM6); Tue, 19 Feb 2019 07:51:30 GMT From: Date: Tue, 19 Feb 2019 07:51:30 +0000 (GMT) X-Mailer: RMM6 In-Reply-To: <87va1hyyna.fsf@nckx> Message-Id: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 34523 <34523@debbugs.gnu.org> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 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 From b82be816ed92afd3988ffdee1206edfe9a19616a Mon Sep 17 00:00:00 2001 From: Pkill -9 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 ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong +;;; Copyright © 2019 Pkill -9 ;;; ;;; 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