From patchwork Thu Feb 18 20:26:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Reich=C3=B6r?= X-Patchwork-Id: 27131 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 9F3EA27BC49; Thu, 18 Feb 2021 20:27:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A8C6327BC48 for ; Thu, 18 Feb 2021 20:27:53 +0000 (GMT) Received: from localhost ([::1]:39442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCptw-0007Or-OE for patchwork@mira.cbaines.net; Thu, 18 Feb 2021 15:27:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCpt8-0007Mq-Df for guix-patches@gnu.org; Thu, 18 Feb 2021 15:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCpt7-0005RA-S0 for guix-patches@gnu.org; Thu, 18 Feb 2021 15:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lCpt7-0002L3-OX for guix-patches@gnu.org; Thu, 18 Feb 2021 15:27:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46598] [PATCH] gnu: Add vitetris. Resent-From: Stefan =?utf-8?q?Reich=C3=B6r?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Feb 2021 20:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46598 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: 46598@debbugs.gnu.org Received: via spool by 46598-submit@debbugs.gnu.org id=B46598.16136799778938 (code B ref 46598); Thu, 18 Feb 2021 20:27:01 +0000 Received: (at 46598) by debbugs.gnu.org; 18 Feb 2021 20:26:17 +0000 Received: from localhost ([127.0.0.1]:48100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lCpsL-0002K1-Df for submit@debbugs.gnu.org; Thu, 18 Feb 2021 15:26:17 -0500 Received: from dd3624.kasserver.com ([85.13.130.11]:37070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lCpsJ-0002Jq-Im for 46598@debbugs.gnu.org; Thu, 18 Feb 2021 15:26:12 -0500 Received: from localhost (217-149-162-201.nat.highway.telekom.at [217.149.162.201]) by dd3624.kasserver.com (Postfix) with ESMTPA id E988C5D40038; Thu, 18 Feb 2021 21:26:06 +0100 (CET) From: Stefan =?utf-8?q?Reich=C3=B6r?= In-Reply-To: <87lfbld544.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Thu, 18 Feb 2021 11:47:55 +0100") References: <20210217200853.58442-1-stefan@xsteve.at> <87lfbld544.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) Date: Thu, 18 Feb 2021 21:26:06 +0100 Message-ID: <87zh01azs1.fsf@xsteve.at> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Nicolas, thanks for the detailed review of my patch. I didn't think that I am able to produce a patch with that many little shortcomings ;-) Your help is highly appreciated! > Hello, > > Stefan Reichör writes: > >> * gnu/packages/games.scm (vitetris): New variable. > > Thank you! Some comments follow. > > >> + (version "v0.59.1") > > You're mixing the version and the tag name. The version should be > "0.59.1"... > >> + (source >> + (origin >> + (method git-fetch) >> + (uri (git-reference >> + (url "https://github.com/vicgeralds/vitetris") >> + (commit version))) > > ... and the commit should be (string-append "v" version). > >> + ;; src/src-conf.mk must be writable for the build step >> + (chmod "src/src-conf.mk" #o666) > > I suggest (make-file-writeable "src/src-conf.mk") > >> + #t))) > > You can omit it. > >> + #:tests? #f ; no test >> + #:make-flags >> + (list ,(string-append "CC=" (cc-for-target)) >> + (string-append "DESTDIR=" (assoc-ref %outputs "out"))))) > > There is an issue here. The install script does not install executable > in %out/bin, but in %out/usr/local/bin. > >> + (home-page "http://victornils.net/tetris/") >> + (synopsis "Terminal-based tetris clone") > > tetris -> Tetris > >> + (description "Classic multiplayer tetris for the terminal.") > > I suggest: > > Vitetris is a classic multiplayer Tetris clone for the terminal. > > > Could you send an updated patch? Of course - I hope that I have addressed all the issues. > Regards, gnu: Add vitetris. From: Stefan Reichör * gnu/packages/games.scm (vitetris): New variable. --- gnu/packages/games.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d8c98a9a2f..bab2714c0d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2020 Lu hux ;;; Copyright © 2020 Tomás Ortín Fernández ;;; Copyright © 2021 Olivier Rojon +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -545,6 +546,39 @@ Playing bastet can be a painful experience, especially if you usually make canyons and wait for the long I-shaped block to clear four rows at a time.") (license license:gpl3+))) +(define-public vitetris + (package + (name "vitetris") + (version "0.59.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vicgeralds/vitetris") + (commit (string-append "v" version)))) + (sha256 + (base32 "1ah1c5g7abksif0n8v5rb7r4pn2az20c3mkp4ak13vgs23ddmds5")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'configure + (lambda _ + ;; the non standard configure script does not accept + ;; standard parameters -> invoke configure by hand + (invoke "./configure" "prefix=") + ;; src/src-conf.mk must be writable for the build step + (make-file-writable "src/src-conf.mk")))) + #:tests? #f ; no test + #:make-flags + (list ,(string-append "CC=" (cc-for-target)) + (string-append "DESTDIR=" (assoc-ref %outputs "out"))))) + (home-page "http://victornils.net/tetris/") + (synopsis "Terminal-based Tetris clone") + (description "Vitetris is a classic multiplayer Tetris clone for the +terminal.") + (license license:bsd-2))) + (define-public blobwars (package (name "blobwars")