From unknown Thu Sep 11 16:39:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26488: [PATCH] gnu: Add crawl. Resent-From: nee Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2017 21:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26488@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149211894832154 (code B ref -1); Thu, 13 Apr 2017 21:30:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Apr 2017 21:29:08 +0000 Received: from localhost ([127.0.0.1]:46169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cymId-0008MY-M0 for submit@debbugs.gnu.org; Thu, 13 Apr 2017 17:29:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cymG8-0008I7-0x for submit@debbugs.gnu.org; Thu, 13 Apr 2017 17:26:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cymG1-0000oC-J9 for submit@debbugs.gnu.org; Thu, 13 Apr 2017 17:26:26 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:60607) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cymG1-0000o8-FY for submit@debbugs.gnu.org; Thu, 13 Apr 2017 17:26:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cymFz-0001gi-Uo for guix-patches@gnu.org; Thu, 13 Apr 2017 17:26:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cymFv-0000mX-Ts for guix-patches@gnu.org; Thu, 13 Apr 2017 17:26:23 -0400 Received: from cock.li ([185.100.85.212]:57185) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cymFv-0000lm-GU for guix-patches@gnu.org; Thu, 13 Apr 2017 17:26:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1492118776; bh=sbWmbU1ZeceTTPT9V6f8ouvwxhZJlkjjkh3VGe2skRo=; h=To:From:Subject:Date:From; b=mjavyytXiQZdXAoJqQ2c9o/05iO+UpOx7YGAQSF0WcZFAELS7SN8krEGMBBR8hKWq VyZA1LyGLGaCttJfyxBEGFv1iPVD/JNadBLovy1hFwsCHt/Yjiveo2dtCjmniw5TO8 pJMygvwGcbZnX6G5Alu6+CePQhYjv9BCxeXz4KTewLMbKtR9b0whTIAzQcbzypbOI4 2upCaGA4HqWLMx20InFV5xt4s2wbx6/HmL95vfxThOTVgiiMrAl5dq9FTahWA1aTWF 3STPifXPZrhZjlyoJ3X7vL7b5fb6cME0knOU4ryJJzCOGxXJBQczxbNtzcZt+tBcyK VlAgF03iWfM+Q== From: nee X-Enigmail-Draft-Status: N1110 Message-ID: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> Date: Thu, 13 Apr 2017 23:26:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------DF81CA65153477EE1B39C72B" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Mailman-Approved-At: Thu, 13 Apr 2017 17:29:06 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) This is a multi-part message in MIME format. --------------DF81CA65153477EE1B39C72B Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, this is just the console version for now. There is also a graphical version that I haven't build on the latest release, yet. * Multiple uris When crawl makes a new release they move the previous tar archive into a major-minor prefixed sub-directory. The current release only exists in the higher directory. I haven't seen any other package list multiple uris, so I hope I entered it correctly. I can only say that it builds, and got through guix lint like this. --------------DF81CA65153477EE1B39C72B Content-Type: text/x-patch; name="0001-gnu-Add-crawl.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-crawl.patch" =46rom fd456a6f73fff5a2b9348ca1e43bd61fdf79fc6c Mon Sep 17 00:00:00 2001 From: nee Date: Thu, 13 Apr 2017 22:45:18 +0200 Subject: [PATCH] gnu: Add crawl. * gnu/packages/games.scm (crawl): New variable. --- gnu/packages/games.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++= ++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 710b2746c..522ad5366 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -115,6 +115,8 @@ #:use-module (gnu packages messaging) #:use-module (gnu packages upnp) #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix build-system python) @@ -3649,3 +3651,68 @@ small robot living in the nano world, repair its m= aker.") ;; kiki-the-nano-bot/kiki-the-nano-bot_1.0.2+dfsg1-4_copyright> ;; for a statement from the author. (license license:public-domain))) + +(define-public crawl + (package + (name "crawl") + (version "0.19.5") + (source (origin + (method url-fetch) + (uri (list + ;; Older releases get moved into a versioned directo= ry + (string-append "http://crawl.develz.org/release/" + (version-major+minor version) "/stone= _soup-" + version "-nodeps.tar.xz") + ;; Only the latest release is in this directory + (string-append "http://crawl.develz.org/release/ston= e_soup-" + version "-nodeps.tar.xz"))) + (sha256 + (base32 + "00yl2lb2shglxlxzpyk99zvglfx4amjybqwnzdcasvbiggb4cj18"))= )) + (arguments + '(#:tests? #f + #:make-flags + (let* ((sqlite (assoc-ref %build-inputs "sqlite")) + (out (assoc-ref %outputs "out"))) + (list (string-append "sqlite=3D" sqlite) + (string-append "prefix=3D" out) + "SAVEDIR=3D~/.crawl" + "dejavu_fonts=3D" + "TILES=3D" + "BUILD_LUA=3D" + "BUILD_SQLITE=3D" + "BUILD_ZLIB=3D")) + #:phases + (modify-phases + %standard-phases + (add-after + 'unpack 'prepare-before-make + (lambda* (#:key inputs #:allow-other-keys) + (chdir "source"))) + (add-before + 'configure 'patch-makefile + (lambda* (#:key inputs #:allow-other-keys) + (substitute* + "Makefile" + (("SQLITE_INCLUDE_DIR :=3D /usr/include") + "SQLITE_INCLUDE_DIR :=3D ${sqlite}/include")) + (substitute* + "Makefile" + (("/usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/= fonts;") + "${dejavu_fonts}/share/fonts;")))) + (delete 'configure)))) + (build-system gnu-build-system) + (inputs `(("ncurses" ,ncurses) + ("sqlite" ,sqlite) + ("bison" ,bison) + ("flex" ,flex) + ("perl" ,perl) + ("zlib" ,zlib) + ("lua51" ,lua-5.1))) + (native-inputs `(("pkg-config" ,pkg-config))) + (synopsis "Roguelike dungeon crawler game") + (description "A roguelike adventure through dungeons filled with dan= gerous +monsters in a quest to find the mystifyingly fabulous Orb of Zot. +The game is also known under the name 'Dungeon Crawl Stone Soup'.") + (home-page "https://crawl.develz.org") + (license license:gpl2+))) --=20 2.12.2 --------------DF81CA65153477EE1B39C72B-- From unknown Thu Sep 11 16:39:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26488: [PATCH] gnu: Add crawl. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Apr 2017 08:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26488@debbugs.gnu.org Received: via spool by 26488-submit@debbugs.gnu.org id=B26488.1492157248699 (code B ref 26488); Fri, 14 Apr 2017 08:08:02 +0000 Received: (at 26488) by debbugs.gnu.org; 14 Apr 2017 08:07:28 +0000 Received: from localhost ([127.0.0.1]:46421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cywGO-0000BD-7u for submit@debbugs.gnu.org; Fri, 14 Apr 2017 04:07:28 -0400 Received: from o111.p9.mailjet.com ([87.253.234.111]:47919) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@bnc3.mailjet.com>) id 1cywGM-0000B4-6O for 26488@debbugs.gnu.org; Fri, 14 Apr 2017 04:07:27 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=D0xHZV5eOEFqbUAByyudQz6ojgk=; b=Hx+JXhiu4ydz+StX9duAgOypH2r+ycacUtZSUE4O5reM9gtuqw7ch5MSq cflou80uPOX/P7pvJ5nfheqrr9/5Lf0pYsbhUmxFLlaCzeWjY5ETKgGxOWZQ 2DIojCE+2DwGmrwSIcR9JWUHAubKd2almhghU3OqzxdMi40dKsaEMA= Message-Id: <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> MIME-Version: 1.0 From: Arun Isaac Date: Fri, 14 Apr 2017 13:37:01 +0530 In-reply-to: References: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9vCkjXi6WSjKmiXP-TxbRmwAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Thanks for the patch! >> + (uri (list >> + ;; Older releases get moved into a versioned direct= ory >> + (string-append "http://crawl.develz.org/release/" >> + (version-major+minor version) "/ston= e_soup-" >> + version "-nodeps.tar.xz") >> + ;; Only the latest release is in this directory >> + (string-append "http://crawl.develz.org/release/sto= ne_soup-" >> + version "-nodeps.tar.xz"))) Why do we need two URIs? Shouldn't the latest release alone be enough? Isn't that the only release we need to build? >> + (arguments >> + '(#:tests? #f The release tarball does seem to come with tests. Could you package them as well? >> + #:phases >> + (modify-phases >> + %standard-phases Please put modify-phases and %standard-phases on the same line like: (modify-phases %standard-phases >> + (add-after >> + 'unpack 'prepare-before-make >> + (lambda* (#:key inputs #:allow-other-keys) >> + (chdir "source"))) I haven't actually tried building the package, but is this phase necessary? If you do want to change directory before running make, you can pass "-C" and "source" as #:make-flags. >> + (add-before >> + 'configure 'patch-makefile >> + (lambda* (#:key inputs #:allow-other-keys) >> + (substitute* >> + "Makefile" >> + (("SQLITE_INCLUDE_DIR :=3D /usr/include") >> + "SQLITE_INCLUDE_DIR :=3D ${sqlite}/include")) >> + (substitute* >> + "Makefile" >> + (("/usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11= /fonts;") >> + "${dejavu_fonts}/share/fonts;")))) >> + (delete 'configure)))) You should be able to do this using #:make-flags. See https://www.gnu.org/software/make/manual/html_node/Overriding.html >> + (description "A roguelike adventure through dungeons filled with da= ngerous >> +monsters in a quest to find the mystifyingly fabulous Orb of Zot. >> +The game is also known under the name 'Dungeon Crawl Stone Soup'.") Could you make this "Dungeon Crawl Stone Soup is a roguelike adventure ... "? Also, remove the last sentence "The game is also known as ...". >> + (license license:gpl2+))) licence.txt mentions multiple licenses. Could you mention them all as a list of licenses? = From unknown Thu Sep 11 16:39:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26488: [PATCH] gnu: Add crawl. Resent-From: nee Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Apr 2017 16:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac Cc: 26488@debbugs.gnu.org Received: via spool by 26488-submit@debbugs.gnu.org id=B26488.14921887934255 (code B ref 26488); Fri, 14 Apr 2017 16:54:02 +0000 Received: (at 26488) by debbugs.gnu.org; 14 Apr 2017 16:53:13 +0000 Received: from localhost ([127.0.0.1]:47396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cz4TA-00016W-6F for submit@debbugs.gnu.org; Fri, 14 Apr 2017 12:53:13 -0400 Received: from cock.li ([185.100.85.212]:33248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cz3oG-0006oc-Cv for 26488@debbugs.gnu.org; Fri, 14 Apr 2017 12:10:57 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on cock.li X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_RECEIVED, NO_RELAYS,T_DKIM_INVALID autolearn=disabled version=3.4.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1492186249; bh=B5M4A3UptwIzFc8sPON04gkcEYUsnllwKIImrG3OlkQ=; h=Subject:To:References:From:Cc:Date:In-Reply-To:From; b=QrJG74ayn9pfiwzyk+P41I/huxJAtDu04NFVaay+KEEYBJnmtdCsx0nLAroqKpMT9 tUmgRIUoPk/AhFvmZytAhKIHoPDVNYUbTS9YLedFvRCnsafHK/8wd9yt/3O8uIimS5 S6ppuVyhxmj6vdEgmZKqjhcpwRiEWNnfY3Mn/IJema46z/9oQYfzDMB6wrz3Y/4hzs JXp2DOFBPkmfsEwnpfJAy6rcDjGLbnA3vDG20U7HQXO4D4Kgom3LnyVwHTbSfFgPfI TXpt///bnV8o6VxIr3X6Twc5jKYLyM9HCnpfVHtW01s7Z7P7Zm0/8Fz1Q+F8ZSU3KA xa8pKNKNv5WdA== References: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> From: nee X-Enigmail-Draft-Status: N1110 Message-ID: Date: Fri, 14 Apr 2017 18:10:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> Content-Type: multipart/mixed; boundary="------------0AAA76C303A06C75E6556074" X-Spam-Score: 0.0 (/) X-Mailman-Approved-At: Fri, 14 Apr 2017 12:53:11 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) This is a multi-part message in MIME format. --------------0AAA76C303A06C75E6556074 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 8bit Hello, thank you for reviewing my patch. Am 14.04.2017 um 10:07 schrieb Arun Isaac: > > Thanks for the patch! > >>> + (uri (list >>> + ;; Older releases get moved into a versioned directory >>> + (string-append "http://crawl.develz.org/release/" >>> + (version-major+minor version) "/stone_soup-" >>> + version "-nodeps.tar.xz") >>> + ;; Only the latest release is in this directory >>> + (string-append "http://crawl.develz.org/release/stone_soup-" >>> + version "-nodeps.tar.xz"))) > > Why do we need two URIs? Shouldn't the latest release alone be enough? > Isn't that the only release we need to build? > My thought is that this way the build won't break in the same moment a new version is released, since the referenced tar 404s when they move it. >>> + (arguments >>> + '(#:tests? #f > > The release tarball does seem to come with tests. Could you package them > as well? > Ah, I missed those because they are in make test and not make check. I tried to package them now, but the tests need to create a directory in home. This fails and I don't know how to handle this with guix. I need some help here. >>> + #:phases >>> + (modify-phases >>> + %standard-phases > > Please put modify-phases and %standard-phases on the same line like: > > (modify-phases %standard-phases > Okay, done. >>> + (add-after >>> + 'unpack 'prepare-before-make >>> + (lambda* (#:key inputs #:allow-other-keys) >>> + (chdir "source"))) > > I haven't actually tried building the package, but is this phase > necessary? If you do want to change directory before running make, you > can pass "-C" and "source" as #:make-flags. > Yes, it works great! I didn't know about that before, thank you. >>> + (add-before >>> + 'configure 'patch-makefile >>> + (lambda* (#:key inputs #:allow-other-keys) >>> + (substitute* >>> + "Makefile" >>> + (("SQLITE_INCLUDE_DIR := /usr/include") >>> + "SQLITE_INCLUDE_DIR := ${sqlite}/include")) >>> + (substitute* >>> + "Makefile" >>> + (("/usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/fonts;") >>> + "${dejavu_fonts}/share/fonts;")))) >>> + (delete 'configure)))) > > You should be able to do this using #:make-flags. See > https://www.gnu.org/software/make/manual/html_node/Overriding.html > 100% right! I also removed the second substitute, since fonts are only required for the graphical version. I started packaging this more than half a year ago and only recently decided to give it another try and remove the graphical version. Seems like I still missed out on removing a lot of the mess. >>> + (description "A roguelike adventure through dungeons filled with dangerous >>> +monsters in a quest to find the mystifyingly fabulous Orb of Zot. >>> +The game is also known under the name 'Dungeon Crawl Stone Soup'.") > > Could you make this "Dungeon Crawl Stone Soup is a roguelike adventure > ... "? Also, remove the last sentence "The game is also known as ...". > >>> + (license license:gpl2+))) > > licence.txt mentions multiple licenses. Could you mention them all as a > list of licenses? > > > I did both now. I hope this is the right way. I'm appending my current WIP version. The test phase is broken and I'll need help, as I said above. When I disable the tests, the game builds and can be played. --------------0AAA76C303A06C75E6556074 Content-Type: text/x-patch; name="0001-gnu-Add-crawl.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-crawl.patch" =46rom ddb53e51bbc8592e32b81cfcc4773de1a6ba2b6c Mon Sep 17 00:00:00 2001 From: nee Date: Thu, 13 Apr 2017 22:45:18 +0200 Subject: [PATCH] gnu: Add crawl. * gnu/packages/games.scm (crawl): New variable. --- gnu/packages/games.scm | 70 ++++++++++++++++++++++++++++++++++++++++++++= ++++++ 1 file changed, 70 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 710b2746c..c145ba830 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -115,6 +115,8 @@ #:use-module (gnu packages messaging) #:use-module (gnu packages upnp) #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix build-system python) @@ -3649,3 +3651,71 @@ small robot living in the nano world, repair its m= aker.") ;; kiki-the-nano-bot/kiki-the-nano-bot_1.0.2+dfsg1-4_copyright> ;; for a statement from the author. (license license:public-domain))) + +(define-public crawl + (package + (name "crawl") + (version "0.19.5") + (source (origin + (method url-fetch) + (uri (list + ;; Older releases get moved into a versioned directo= ry + (string-append "http://crawl.develz.org/release/" + (version-major+minor version) "/stone= _soup-" + version "-nodeps.tar.xz") + ;; Only the latest release is in this directory + (string-append "http://crawl.develz.org/release/ston= e_soup-" + version "-nodeps.tar.xz"))) + (sha256 + (base32 + "00yl2lb2shglxlxzpyk99zvglfx4amjybqwnzdcasvbiggb4cj18"))= )) + (arguments + '(#:make-flags + (let* ((sqlite (assoc-ref %build-inputs "sqlite")) + (out (assoc-ref %outputs "out"))) + (list (string-append "SQLITE_INCLUDE_DIR=3D" sqlite "/include")= + (string-append "prefix=3D" out) + "SAVEDIR=3D~/.crawl" + "TILES=3D" + "BUILD_LUA=3D" + "BUILD_SQLITE=3D" + "BUILD_ZLIB=3D" + "-Csource")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace + 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (and + (mkdir-p "~/.crawl/saves") + (zero? (system* + "make" "test" + (string-append "prefix=3D" out) + "TILES=3D" + "BUILD_LUA=3D" + "BUILD_SQLITE=3D" + "BUILD_ZLIB=3D" + "-Csource"))))))))) + (build-system gnu-build-system) + (inputs `(("ncurses" ,ncurses) + ("sqlite" ,sqlite) + ("bison" ,bison) + ("flex" ,flex) + ("zlib" ,zlib) + ("lua51" ,lua-5.1))) + (native-inputs `(("pkg-config" ,pkg-config) + ("perl" ,perl))) + (synopsis "Roguelike dungeon crawler game") + (description "Dungeon Crawl Stone Soup is a roguelike adventure thro= ugh +dungeons filled with dangerous monsters in a quest to find the mystifyin= gly +fabulous Orb of Zot.") + (home-page "https://crawl.develz.org") + (license (list license:gpl2+ + license:bsd-2 + license:bsd-3 + license:cc0 + license:x11 + license:zlib + license:asl2.0)))) --=20 2.12.2 --------------0AAA76C303A06C75E6556074-- From unknown Thu Sep 11 16:39:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26488: [PATCH] gnu: Add crawl. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Apr 2017 17:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: nee Cc: Arun Isaac , 26488@debbugs.gnu.org Received: via spool by 26488-submit@debbugs.gnu.org id=B26488.14921906246934 (code B ref 26488); Fri, 14 Apr 2017 17:24:01 +0000 Received: (at 26488) by debbugs.gnu.org; 14 Apr 2017 17:23:44 +0000 Received: from localhost ([127.0.0.1]:47410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cz4wi-0001nm-Gd for submit@debbugs.gnu.org; Fri, 14 Apr 2017 13:23:44 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:39062) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cz4wf-0001nd-WA for 26488@debbugs.gnu.org; Fri, 14 Apr 2017 13:23:42 -0400 Received: from localhost (77.118.143.115.wireless.dyn.drei.com [77.118.143.115]) by dd1012.kasserver.com (Postfix) with ESMTPSA id A9B7B1CA0536; Fri, 14 Apr 2017 19:23:39 +0200 (CEST) Date: Fri, 14 Apr 2017 19:23:37 +0200 From: Danny Milosavljevic Message-ID: <20170414192337.4c7b33e5@scratchpost.org> In-Reply-To: References: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) > Ah, I missed those because they are in make test and not make check. > I tried to package them now, but the tests need to create a directory in > home. This fails and I don't know how to handle this with guix. > I need some help here. (add-before 'check 'set-check-up (lambda _ (setenv "HOME" (getcwd)) ; or maybe /tmp or something #t)) From unknown Thu Sep 11 16:39:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26488: [PATCH] gnu: Add crawl. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Apr 2017 18:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: nee Cc: Arun Isaac , 26488@debbugs.gnu.org Received: via spool by 26488-submit@debbugs.gnu.org id=B26488.149219310810657 (code B ref 26488); Fri, 14 Apr 2017 18:06:01 +0000 Received: (at 26488) by debbugs.gnu.org; 14 Apr 2017 18:05:08 +0000 Received: from localhost ([127.0.0.1]:47440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cz5am-0002lo-4E for submit@debbugs.gnu.org; Fri, 14 Apr 2017 14:05:08 -0400 Received: from o105.p8.mailjet.com ([87.253.233.105]:60041) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <17796233.AEMAJMF3UlYAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8Q9P@bnc3.mailjet.com>) id 1cz5aj-0002lg-Ou for 26488@debbugs.gnu.org; Fri, 14 Apr 2017 14:05:06 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=ievFE2iB6X8soLAltYL5apm+U14=; b=kuGwHXpKfvtfUiEMTkZtef6Hi/EtYQaiav/ggTOJl2rVluE9J1OMZgugJ aIZa1muRWWyW8TV0+9K+mjmyBxSGT4bHiyeToPY9CkwbEnoUn+WVnZPr9Ts0 0I7Pr9b8MUgONeY9CYV5Tn4NsYI0kNzeIaIKplJfbLxmoHv8huDXZ4= Message-Id: <17796233.AEMAJMF3UlYAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8Q9P@mailjet.com> MIME-Version: 1.0 From: Arun Isaac Date: Fri, 14 Apr 2017 23:34:50 +0530 In-reply-to: References: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEMAJMF3UlYAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8Q9P-196fKWJQAiSD_B_c8b7HAAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) >> Why do we need two URIs? Shouldn't the latest release alone be enough? >> Isn't that the only release we need to build? >> > My thought is that this way the build won't break in the same moment a > new version is released, since the referenced tar 404s when they move it. Ok, that's fine, then. >>>> + (arguments >>>> + '(#:tests? #f >> >> The release tarball does seem to come with tests. Could you package them >> as well? >> > Ah, I missed those because they are in make test and not make check. > I tried to package them now, but the tests need to create a directory in > home. This fails and I don't know how to handle this with guix. > I need some help here. Try (setenv "HOME" "/tmp") as Danny mentioned. >> licence.txt mentions multiple licenses. Could you mention them all as a >> list of licenses? >> > I did both now. I hope this is the right way. Yes, the licenses are correct now. > + (arguments > + '(#:make-flags > + (let* ((sqlite (assoc-ref %build-inputs "sqlite")) > + (out (assoc-ref %outputs "out"))) > + (list (string-append "SQLITE_INCLUDE_DIR=3D" sqlite "/include") > + (string-append "prefix=3D" out) > + "SAVEDIR=3D~/.crawl" > + "TILES=3D" > + "BUILD_LUA=3D" > + "BUILD_SQLITE=3D" > + "BUILD_ZLIB=3D" > + "-Csource")) Only a matter of aesthetics, but you could split "-C" and "source" into separate strings. > + #:phases > + (modify-phases %standard-phases > + (delete 'configure) > + (replace > + 'check Put 'check on the same line as replace. In emacs, you can use guix-devel-mode from emacs-guix to help you with indenting correctly. > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out"))) > + (and > + (mkdir-p "~/.crawl/saves") > + (zero? (system* > + "make" "test" > + (string-append "prefix=3D" out) > + "TILES=3D" > + "BUILD_LUA=3D" > + "BUILD_SQLITE=3D" > + "BUILD_ZLIB=3D" > + "-Csource"))))))))) You can drop the `and' function call, and just make it individual calls to `mkdir-p' and `zero?' Looking good so far! Only the check phase remains... = From unknown Thu Sep 11 16:39:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26488: [PATCH] gnu: Add crawl. Resent-From: nee Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2017 02:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac Cc: 26488@debbugs.gnu.org Received: via spool by 26488-submit@debbugs.gnu.org id=B26488.149239718230995 (code B ref 26488); Mon, 17 Apr 2017 02:47:02 +0000 Received: (at 26488) by debbugs.gnu.org; 17 Apr 2017 02:46:22 +0000 Received: from localhost ([127.0.0.1]:51227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1czwgD-00083j-1A for submit@debbugs.gnu.org; Sun, 16 Apr 2017 22:46:22 -0400 Received: from cock.li ([185.100.85.212]:37432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1czwgA-00083X-Vo for 26488@debbugs.gnu.org; Sun, 16 Apr 2017 22:46:15 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on cock.li X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20, NO_RECEIVED, NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1492397169; bh=WgjclWPfAcE2CdRgB7G2wz+q7YEDzex0sygbifsfgA4=; h=Subject:To:References:From:Cc:Date:In-Reply-To:From; b=VkEtMaZXshhE9YeQjrJeAmvnGzJROvHN75rLdVcwCyrz7uqce0ckISdNxwUyNdyOf M02ruHN/1Jb05uId/Omavzg9A/4Qjl9GvThEXREl4sPy6pISvzsg5OvJZIMtpzZqBK Ek5CPf7foMT3K2+MTRTHXookZvQ8dCvExaFDjpbO83405rKVqPOncuXJxRFXQOuzuG AaRRIKO3jPPnckaMwveswisJHa7v6Ai0otpX5wsDuS8tg4HPG6Q1W1Wr/CGBpxeE+H uKcYRIw/c6ZNacXnApPko8pmgQuRa/8CDePAioUIV0Y4zo8qDZae0o0RDttLx7cYdC yEItQQRcSOk6g== References: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> From: nee X-Enigmail-Draft-Status: N1110 Message-ID: <8ac92fe4-14dd-3933-8901-bea4ff8673ac@cock.li> Date: Mon, 17 Apr 2017 06:46:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------3DAA95E91640AB4DA42CB738" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) This is a multi-part message in MIME format. --------------3DAA95E91640AB4DA42CB738 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 8bit Am 14.04.2017 um 20:04 schrieb Arun Isaac: > Try (setenv "HOME" "/tmp") as Danny mentioned. > Works, thanks to both of you. > Only a matter of aesthetics, but you could split "-C" and "source" into > separate strings. > All the packages in games.scm do it as one string, so I didn't change it for now. It should be changed for all packages at once. > Put 'check on the same line as replace. In emacs, you can use > guix-devel-mode from emacs-guix to help you with indenting correctly. > Thanks, I installed emacs-guix and it indents correctly now. Previously I assumed the .dir-locals.el would be enough. > Looking good so far! Only the check phase remains... > Good news everyone, I managed to package the check phase and all the tests pass! The downside is that in order to run the tests the whole game must be rebuild with a -DDEBUG define that seems to enable asserts and debug outputs, otherwise the tests won't run. So the build times are doubled. That rebuild overwrites the objects, executable, and the .cflags file from the build phase, so install would build it a 3rd time. I worked around this by moving the check phase before the build phase. I also added myself to the copyright header, since you mentioned that in the mcomix thread. --------------3DAA95E91640AB4DA42CB738 Content-Type: text/x-patch; name="0001-gnu-Add-crawl.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-crawl.patch" =46rom 72aa4b81e767edd451c5859be7e1d67f3c4ceedf Mon Sep 17 00:00:00 2001 From: nee Date: Thu, 13 Apr 2017 22:45:18 +0200 Subject: [PATCH] gnu: Add crawl. * gnu/packages/games.scm (crawl): New variable. --- gnu/packages/games.scm | 79 ++++++++++++++++++++++++++++++++++++++++++++= ++++++ 1 file changed, 79 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 710b2746c..502fa74ce 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -27,6 +27,7 @@ ;;; Copyright =C2=A9 2017 Adonay "adfeno" Felipe Nogueira ;;; Copyright =C2=A9 2017 Arun Isaac ;;; Copyright =C2=A9 2017 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2017 nee ;;; ;;; This file is part of GNU Guix. ;;; @@ -115,6 +116,8 @@ #:use-module (gnu packages messaging) #:use-module (gnu packages upnp) #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix build-system python) @@ -3649,3 +3652,79 @@ small robot living in the nano world, repair its m= aker.") ;; kiki-the-nano-bot/kiki-the-nano-bot_1.0.2+dfsg1-4_copyright> ;; for a statement from the author. (license license:public-domain))) + +(define-public crawl + (package + (name "crawl") + (version "0.19.5") + (source (origin + (method url-fetch) + (uri (list + ;; Older releases get moved into a versioned directo= ry + (string-append "http://crawl.develz.org/release/" + (version-major+minor version) "/stone= _soup-" + version "-nodeps.tar.xz") + ;; Only the latest release is in this directory + (string-append "http://crawl.develz.org/release/ston= e_soup-" + version "-nodeps.tar.xz"))) + (sha256 + (base32 + "00yl2lb2shglxlxzpyk99zvglfx4amjybqwnzdcasvbiggb4cj18"))= )) + (arguments + '(#:make-flags + (let* ((sqlite (assoc-ref %build-inputs "sqlite")) + (out (assoc-ref %outputs "out"))) + (list (string-append "SQLITE_INCLUDE_DIR=3D" sqlite "/include")= + (string-append "prefix=3D" out) + "SAVEDIR=3D~/.crawl" + "TILES=3D" + "BUILD_LUA=3D" + "BUILD_SQLITE=3D" + "BUILD_ZLIB=3D" + "-Csource")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + ;; Test cases require the source to be rebuild with the -DDEBUG= define. + ;; Do 'check before 'build to avoid a 3rd build on make install= =2E + (add-before 'build 'check + (lambda* (#:key inputs outputs make-flags + parallel-build? parallel-tests? #:allow-other-keys)= + (let* ((parallel-flag (format #f "-j~d" (parallel-job-count= ))) + (test-flags-build (if parallel-build? + (cons parallel-flag + make-flags) + make-flags)) + (test-flags-run (if parallel-tests? + (cons parallel-flag + make-flags) + make-flags))) + (setenv "HOME" (getcwd)) + ;; Fake a terminal for the test cases. + (setenv "TERM" "xterm-256color") + (setenv "COLUMNS" "80") + (setenv "LINES" "24") + (apply system* (cons* "make" "debug" test-flags-build)) + (zero? (apply system* (cons* "make" "test" test-flags-run= ))))))))) + (build-system gnu-build-system) + (inputs `(("ncurses" ,ncurses) + ("sqlite" ,sqlite) + ("bison" ,bison) + ("flex" ,flex) + ("zlib" ,zlib) + ("lua51" ,lua-5.1))) + (native-inputs `(("pkg-config" ,pkg-config) + ("perl" ,perl))) + (synopsis "Roguelike dungeon crawler game") + (description "Dungeon Crawl Stone Soup is a roguelike adventure thro= ugh +dungeons filled with dangerous monsters in a quest to find the mystifyin= gly +fabulous Orb of Zot.") + (home-page "https://crawl.develz.org") + (license (list license:gpl2+ + license:bsd-2 + license:bsd-3 + license:cc0 + license:x11 + license:zlib + license:asl2.0)))) --=20 2.12.2 --------------3DAA95E91640AB4DA42CB738-- From unknown Thu Sep 11 16:39:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26488: [PATCH] gnu: Add crawl. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2017 18:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26488@debbugs.gnu.org Received: via spool by 26488-submit@debbugs.gnu.org id=B26488.149245428822484 (code B ref 26488); Mon, 17 Apr 2017 18:39:01 +0000 Received: (at 26488) by debbugs.gnu.org; 17 Apr 2017 18:38:08 +0000 Received: from localhost ([127.0.0.1]:52872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0BXM-0005qa-8o for submit@debbugs.gnu.org; Mon, 17 Apr 2017 14:38:08 -0400 Received: from o115.p9.mailjet.com ([87.253.234.115]:44589) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0BXK-0005qR-0H for 26488@debbugs.gnu.org; Mon, 17 Apr 2017 14:38:06 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=pq4rnr1Cv/K5/DseD88MSQEsMFA=; b=jINZzaEaqygMgJUU5Q8F6Miy6huCGDFE+XJPrr5e9JoBl5U/DdRdYUA02 D8diSnd2dRYkN36MU8M10jSUBK6NV6WDiH/+KzzCWVVasamYB5PCy4hEgJvc gq9CdNQdHeZ5DSja3X3N/dYveXIhPpmBi19hLWZUnWD6oI11mBdjqU= Message-Id: MIME-Version: 1.0 From: Arun Isaac Date: Tue, 18 Apr 2017 00:07:55 +0530 In-reply-to: <8ac92fe4-14dd-3933-8901-bea4ff8673ac@cock.li> References: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> <8ac92fe4-14dd-3933-8901-bea4ff8673ac@cock.li> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEQAJYdmpaQAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY9QuMsHh6g3_3QTmUpgqcg2B_mAAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) >> Only a matter of aesthetics, but you could split "-C" and "source" into >> separate strings. >> > All the packages in games.scm do it as one string, so I didn't change it > for now. It should be changed for all packages at once. Fair enough... > + #:phases > + (modify-phases %standard-phases > + (delete 'configure) > + (delete 'check) > + ;; Test cases require the source to be rebuild with the -DDEBUG= define. > + ;; Do 'check before 'build to avoid a 3rd build on make install= . > + (add-before 'build 'check > + (lambda* (#:key inputs outputs make-flags > + parallel-build? parallel-tests? #:allow-other-keys) > + (let* ((parallel-flag (format #f "-j~d" (parallel-job-count= ))) > + (test-flags-build (if parallel-build? > + (cons parallel-flag > + make-flags) > + make-flags)) > + (test-flags-run (if parallel-tests? > + (cons parallel-flag > + make-flags) > + make-flags))) The parallel-build? and parallel-tests? arguments are only to disable parallel builds and tests for packages whose build procedures fail when run parallely. crawl's build and tests work fine when run in parallel. So, you don't have to allow for sequential builds in your 'check phase. You can just assume the build is always going to be parallel. No need to test for parallel-build? and parallel-test?. > + (setenv "HOME" (getcwd)) > + ;; Fake a terminal for the test cases. > + (setenv "TERM" "xterm-256color") > + (setenv "COLUMNS" "80") > + (setenv "LINES" "24") It looks like COLUMNS and LINES are not needed to fake a terminal. I was able to build successfully without them. Please check. > + (apply system* (cons* "make" "debug" test-flags-build)) > + (zero? (apply system* (cons* "make" "test" test-flags-run= ))))))))) You can combine the two make commands into one. (zero? (apply system* "make" "debug" "test" flags)) Also note that only the last argument of apply needs to be a list. No need to cons* together to construct a list like you have done. > + (build-system gnu-build-system) > + (inputs `(("ncurses" ,ncurses) > + ("sqlite" ,sqlite) > + ("bison" ,bison) > + ("flex" ,flex) bison and flex are native-inputs. The bison and flex executables are required only at build time. > + ("zlib" ,zlib) > + ("lua51" ,lua-5.1))) > + (native-inputs `(("pkg-config" ,pkg-config) > + ("perl" ,perl))) It would be nice if you could sort all inputs and native-inputs in alphabetical order. Not all package definitions do it. But, it does look neater. = From unknown Thu Sep 11 16:39:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26488: [PATCH] gnu: Add crawl. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2017 19:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26488@debbugs.gnu.org Received: via spool by 26488-submit@debbugs.gnu.org id=B26488.149245737027297 (code B ref 26488); Mon, 17 Apr 2017 19:30:03 +0000 Received: (at 26488) by debbugs.gnu.org; 17 Apr 2017 19:29:30 +0000 Received: from localhost ([127.0.0.1]:52919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0CL4-00076C-KS for submit@debbugs.gnu.org; Mon, 17 Apr 2017 15:29:30 -0400 Received: from o143.p8.mailjet.com ([87.253.233.143]:50740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <680bbfa9.AEUAJGilBMUAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY9ReX@bnc3.mailjet.com>) id 1d0CL2-000764-Uf for 26488@debbugs.gnu.org; Mon, 17 Apr 2017 15:29:29 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=de1WHzcwZ1TonnoofshZ7mg+Bwo=; b=HGmbn4KWamjTqNUOkBW6xFmLl8TmFU4q0IoaUxr5hZxdvTkU27vXBJCBm S2AYsf0FstOfMHahH3ah7udBFagfNwttTYDjQ2BBmCWtkXO5LNFCJKVhmkn7 B2AWB0U3SkxNOx2cBPo3yts2gBYVe766cq2fa+A/eReVTp69JUH0Bc= Message-Id: <680bbfa9.AEUAJGilBMUAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY9ReX@mailjet.com> MIME-Version: 1.0 From: Arun Isaac Date: Tue, 18 Apr 2017 00:59:21 +0530 In-reply-to: <8ac92fe4-14dd-3933-8901-bea4ff8673ac@cock.li> References: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> <8ac92fe4-14dd-3933-8901-bea4ff8673ac@cock.li> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEUAJGilBMUAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY9ReXiZl-eBwATbuT8rBYeztWVQAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.8 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) > + "TILES=3D" This disables the building of the graphical interface, if I'm not wrong. Could you build the graphical interface as well? > + "BUILD_LUA=3D" > + "BUILD_SQLITE=3D" > + "BUILD_ZLIB=3D" Also, could you explain what these three BUILD_* make-flags do? Is it to disable the use of their bundled lua, sqlite and zlib libraries? I can't for the life of me, read and understand their Makefile. They seem to have basically reinvented autoconf in a large hand-written Makefile. Thanks! = From unknown Thu Sep 11 16:39:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26488: [PATCH] gnu: Add crawl. Resent-From: nee Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2017 21:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac Cc: 26488@debbugs.gnu.org Received: via spool by 26488-submit@debbugs.gnu.org id=B26488.14924645695971 (code B ref 26488); Mon, 17 Apr 2017 21:30:03 +0000 Received: (at 26488) by debbugs.gnu.org; 17 Apr 2017 21:29:29 +0000 Received: from localhost ([127.0.0.1]:53042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0EDB-0001YF-2T for submit@debbugs.gnu.org; Mon, 17 Apr 2017 17:29:29 -0400 Received: from cock.li ([185.100.85.212]:57824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0ED8-0001Xz-OP for 26488@debbugs.gnu.org; Mon, 17 Apr 2017 17:29:27 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on cock.li X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50, NO_RECEIVED, NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1492464559; bh=13wfx7leXdiRzHsB7xJC54Y+VrXXYCUr/Y1v7sUGu3k=; h=Subject:To:References:From:Cc:Date:In-Reply-To:From; b=e5mPa7rJEIPLy789bEb5HkwDnwgWgxJ97X0FiDZM9Gdqrp5DBRKx7QSJhyMhfZmCo j80hG0arzRLDJzbOk24S6sEOgq4UPNUgD3s6/spzQws47Yp/mS5FvRY8KCJ5zyVS2b lKZ2cWm4DssJcuHHWlyIbBnr9xtE+0MdeP365yLLF2kXrdB+5ZgPR/0nsR5vKVtxnK KE6h3o+XNexyKliQKUcY/Gl4kqtVualvGDNNck4Tzs8fn86ntx8m0FLBmTFGz84281 8CV8xgIxg96tsbRD9aaP+/Ii4bgKkPft/gl1fK+8JMuvSG1EUCwwBQfoBwLJrBTXMO 83rcyK+6BOUCg== References: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> <8ac92fe4-14dd-3933-8901-bea4ff8673ac@cock.li> <680bbfa9.AEUAJGilBMUAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY9ReX@mailjet.com> From: nee X-Enigmail-Draft-Status: N1110 Message-ID: <44c84e28-1117-82b0-d9ee-eb02d33c7319@cock.li> Date: Mon, 17 Apr 2017 23:29:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <680bbfa9.AEUAJGilBMUAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY9ReX@mailjet.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Am 17.04.2017 um 21:29 schrieb Arun Isaac: > >> + "TILES=" > > This disables the building of the graphical interface, if I'm not > wrong. Could you build the graphical interface as well? > Yes, I'll definitely try that once the terminal package is good enough. >> + "BUILD_LUA=" >> + "BUILD_SQLITE=" >> + "BUILD_ZLIB=" > > Also, could you explain what these three BUILD_* make-flags do? Is it to > disable the use of their bundled lua, sqlite and zlib libraries? I can't > for the life of me, read and understand their Makefile. They seem to > have basically reinvented autoconf in a large hand-written Makefile. > > Thanks! > > > That's exactly what it's for. By default it will look for the bundled libraries and fail since I download the -nodeps.tar I'll add a comment. From unknown Thu Sep 11 16:39:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26488: [PATCH] gnu: Add crawl. Resent-From: nee Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Apr 2017 22:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26488@debbugs.gnu.org Received: via spool by 26488-submit@debbugs.gnu.org id=B26488.149255375316741 (code B ref 26488); Tue, 18 Apr 2017 22:16:01 +0000 Received: (at 26488) by debbugs.gnu.org; 18 Apr 2017 22:15:53 +0000 Received: from localhost ([127.0.0.1]:55306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0bPY-0004Lr-8P for submit@debbugs.gnu.org; Tue, 18 Apr 2017 18:15:53 -0400 Received: from cock.li ([185.100.85.212]:53666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0bPW-0004Lc-1c for 26488@debbugs.gnu.org; Tue, 18 Apr 2017 18:15:47 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on cock.li X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20, NO_RECEIVED, NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1492553733; bh=2TwR9V9PLxj7ROptYkTaVF96OFD2j54Mwa5kX5346q0=; h=Subject:To:References:From:Date:In-Reply-To:From; b=yyT2lVepmdUnuThZmrIPbbnN3RtnlDqTDMH1efR9jyYaURhx6D6aqJLMtt76wbVQb CFfpCzJ3El4FE3uSDtVSvWuOiMQvJB71dDuWVv+ppBZpSwBI7Wsx8/SPo9o+QfnMqN p1HtKDrZ28RwYRUCYaw9vXcVkAfvIcDXT1SpXmhZTq2/avHMew1oSlUUGGJW8xpOrq J7tHrTo4D8WTJQaJGIwMSNZ9l2ZOVscgRytTENRRP3ExksFMhi2D2NlmOcEiNYUk4n iN5W+wqg51uXwayjFvKiStZWUp2w+WuSs/LbEGeW9x5fHg0w5+0xKUEHZ7yFGVvtz/ DYITItOLJH/Zw== References: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> <8ac92fe4-14dd-3933-8901-bea4ff8673ac@cock.li> From: nee X-Enigmail-Draft-Status: N1110 Message-ID: <43dae64d-8d60-8930-ce6b-12afd44fe787@cock.li> Date: Wed, 19 Apr 2017 00:15:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------E5474E7F2518294641D11115" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) This is a multi-part message in MIME format. --------------E5474E7F2518294641D11115 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 8bit Am 17.04.2017 um 20:37 schrieb Arun Isaac: > The parallel-build? and parallel-tests? arguments are only to disable > parallel builds and tests for packages whose build procedures fail when > run parallely. crawl's build and tests work fine when run in > parallel. So, you don't have to allow for sequential builds in your > 'check phase. You can just assume the build is always going to be > parallel. No need to test for parallel-build? and parallel-test?. > Okay, removed it. >> + (setenv "HOME" (getcwd)) >> + ;; Fake a terminal for the test cases. >> + (setenv "TERM" "xterm-256color") >> + (setenv "COLUMNS" "80") >> + (setenv "LINES" "24") > > It looks like COLUMNS and LINES are not needed to fake a terminal. I was > able to build successfully without them. Please check. > I checked it and you are right. I assumed it would impact the tests, because I know that crawl won't run in too small terminals. That doesn't seem to be the case, so I removed it now. > You can combine the two make commands into one. > > Also note that only the last argument of apply needs to be a list. No > need to cons* together to construct a list like you have done. > Always nice to learn how I can make things shorter :) > bison and flex are native-inputs. The bison and flex executables are > required only at build time. > Okay, I moved them into native and it still works. > It would be nice if you could sort all inputs and native-inputs in > alphabetical order. Not all package definitions do it. But, it does look > neater. > Okay, I reordered them. Thank you very much, for your intensive help with cleaning up this package! --------------E5474E7F2518294641D11115 Content-Type: text/x-patch; name="0001-gnu-Add-crawl.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-crawl.patch" =46rom 868d777e1856019c0037c43647cfa245f0d0fb5b Mon Sep 17 00:00:00 2001 From: nee Date: Thu, 13 Apr 2017 22:45:18 +0200 Subject: [PATCH] gnu: Add crawl. * gnu/packages/games.scm (crawl): New variable. --- gnu/packages/games.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++= ++++++ 1 file changed, 71 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 710b2746c..451500a04 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -27,6 +27,7 @@ ;;; Copyright =C2=A9 2017 Adonay "adfeno" Felipe Nogueira ;;; Copyright =C2=A9 2017 Arun Isaac ;;; Copyright =C2=A9 2017 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2017 nee ;;; ;;; This file is part of GNU Guix. ;;; @@ -115,6 +116,8 @@ #:use-module (gnu packages messaging) #:use-module (gnu packages upnp) #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix build-system python) @@ -3649,3 +3652,71 @@ small robot living in the nano world, repair its m= aker.") ;; kiki-the-nano-bot/kiki-the-nano-bot_1.0.2+dfsg1-4_copyright> ;; for a statement from the author. (license license:public-domain))) + +(define-public crawl + (package + (name "crawl") + (version "0.19.5") + (source (origin + (method url-fetch) + (uri (list + ;; Older releases get moved into a versioned directo= ry + (string-append "http://crawl.develz.org/release/" + (version-major+minor version) "/stone= _soup-" + version "-nodeps.tar.xz") + ;; Only the latest release is in this directory + (string-append "http://crawl.develz.org/release/ston= e_soup-" + version "-nodeps.tar.xz"))) + (sha256 + (base32 + "00yl2lb2shglxlxzpyk99zvglfx4amjybqwnzdcasvbiggb4cj18"))= )) + (arguments + '(#:make-flags + (let* ((sqlite (assoc-ref %build-inputs "sqlite")) + (out (assoc-ref %outputs "out"))) + (list (string-append "SQLITE_INCLUDE_DIR=3D" sqlite "/include")= + (string-append "prefix=3D" out) + "SAVEDIR=3D~/.crawl" + ;; disable graphical client + "TILES=3D" + ;; don't build any bundeled dependencies + "BUILD_LUA=3D" + "BUILD_SQLITE=3D" + "BUILD_ZLIB=3D" + "-Csource")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + ;; Test cases require the source to be rebuild with the -DDEBUG= define. + ;; Do 'check before 'build to avoid a 3rd build on make install= =2E + (add-before 'build 'check + (lambda* (#:key inputs outputs make-flags + parallel-build? parallel-tests? #:allow-other-keys)= + (setenv "HOME" (getcwd)) + ;; Fake a terminal for the test cases. + (setenv "TERM" "xterm-256color") + (zero? (apply system* "make" "debug" "test" + (cons (format #f "-j~d" (parallel-job-count))= + make-flags)))))))) + (build-system gnu-build-system) + (inputs `(("lua51" ,lua-5.1) + ("ncurses" ,ncurses) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (native-inputs `(("bison" ,bison) + ("flex" ,flex) + ("pkg-config" ,pkg-config) + ("perl" ,perl))) + (synopsis "Roguelike dungeon crawler game") + (description "Dungeon Crawl Stone Soup is a roguelike adventure thro= ugh +dungeons filled with dangerous monsters in a quest to find the mystifyin= gly +fabulous Orb of Zot.") + (home-page "https://crawl.develz.org") + (license (list license:gpl2+ + license:bsd-2 + license:bsd-3 + license:cc0 + license:x11 + license:zlib + license:asl2.0)))) --=20 2.12.2 --------------E5474E7F2518294641D11115-- From unknown Thu Sep 11 16:39:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26488: [PATCH] gnu: Add crawl. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Apr 2017 06:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: nee Cc: 26488@debbugs.gnu.org Received: via spool by 26488-submit@debbugs.gnu.org id=B26488.14925823038897 (code B ref 26488); Wed, 19 Apr 2017 06:12:01 +0000 Received: (at 26488) by debbugs.gnu.org; 19 Apr 2017 06:11:43 +0000 Received: from localhost ([127.0.0.1]:55428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0iq7-0002JR-Hu for submit@debbugs.gnu.org; Wed, 19 Apr 2017 02:11:43 -0400 Received: from o143.p9.mailjet.com ([87.253.234.143]:46510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0iq6-0002JK-AW for 26488@debbugs.gnu.org; Wed, 19 Apr 2017 02:11:42 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=zUBU5yU6rwVUCm6ibwEi+vCPSuY=; b=EgpeNFbgcBih6Mx/fOyAWzzu38y8oGBpGMs06qHJi/ES1EU7ZupFKk711 9+RXC8BlRTmKM+ZY0suPg96tZZNg4T+UEKhzTSTsbmoqo1eQHLQGCCAaKNfs 2PFA6WsUr7Y6T8vZcAb0OrnIHQBul1+xYiUOmWYC6ltDbGEGf0im4I= Message-Id: MIME-Version: 1.0 From: Arun Isaac Date: Wed, 19 Apr 2017 11:41:34 +0530 In-reply-to: <43dae64d-8d60-8930-ce6b-12afd44fe787@cock.li> References: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> <8ac92fe4-14dd-3933-8901-bea4ff8673ac@cock.li> <43dae64d-8d60-8930-ce6b-12afd44fe787@cock.li> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: ADsAAHQO6XkAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY9v-dzjIQw52vQyOxAx4RKjwI2gAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) > Thank you very much, for your intensive help with cleaning up this packag= e! No problem! That's what I'm here for... :-) And, thank you for your patience with all my corrections! > + #:phases > + (modify-phases %standard-phases > + (delete 'configure) > + (delete 'check) > + ;; Test cases require the source to be rebuild with the -DDEBUG= define. > + ;; Do 'check before 'build to avoid a 3rd build on make install= . > + (add-before 'build 'check > + (lambda* (#:key inputs outputs make-flags > + parallel-build? parallel-tests? #:allow-other-keys) Since you are not using the parallel-build? and parallel-tests? keyword arguments anymore, why keep them in the argument list? > + (zero? (apply system* "make" "debug" "test" > + (cons (format #f "-j~d" (parallel-job-count)) > + make-flags)))))))) As noted earlier, only the last argument of apply needs to be a list. So, this can be shortened to something like: (zero? (apply system* "make" (format #f "-j~d" (parallel-job-count)) "debug" "test" make-flags)) Everything else LGTM! Only the graphical build remains now. = From unknown Thu Sep 11 16:39:19 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26488: [PATCH] gnu: Add crawl. Resent-From: Christopher Allan Webber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Apr 2017 17:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac Cc: nee , 26488@debbugs.gnu.org Received: via spool by 26488-submit@debbugs.gnu.org id=B26488.149279461327628 (code B ref 26488); Fri, 21 Apr 2017 17:11:02 +0000 Received: (at 26488) by debbugs.gnu.org; 21 Apr 2017 17:10:13 +0000 Received: from localhost ([127.0.0.1]:32823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d1c4T-0007BY-1P for submit@debbugs.gnu.org; Fri, 21 Apr 2017 13:10:13 -0400 Received: from dustycloud.org ([50.116.34.160]:53228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d1c4R-0007BQ-Bz for 26488@debbugs.gnu.org; Fri, 21 Apr 2017 13:10:11 -0400 Received: from oolong (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id 5227B265EE; Fri, 21 Apr 2017 13:10:10 -0400 (EDT) References: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> <8ac92fe4-14dd-3933-8901-bea4ff8673ac@cock.li> <43dae64d-8d60-8930-ce6b-12afd44fe787@cock.li> User-agent: mu4e 0.9.18; emacs 25.1.1 From: Christopher Allan Webber In-reply-to: Date: Fri, 21 Apr 2017 12:10:09 -0500 Message-ID: <878tmt7klq.fsf@dustycloud.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Arun Isaac writes: > Everything else LGTM! Only the graphical build remains now. I assume that the graphical build will inherit from the console version anyway? So maybe the graphical build shouldn't hold up the console version if this will take a while? What do you think? From unknown Thu Sep 11 16:39:19 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: nee Subject: bug#26488: closed (Re: bug#26488: [PATCH] gnu: Add crawl.) Message-ID: References: <4e2babb3.AEAAJVZanZ0AAAAAAAAAAAO3B-sAAAACwQwAAAAAAAW9WABY-mrJ@mailjet.com> <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> X-Gnu-PR-Message: they-closed 26488 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26488@debbugs.gnu.org Date: Fri, 21 Apr 2017 20:26:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1492806362-26415-1" This is a multi-part message in MIME format... ------------=_1492806362-26415-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26488: [PATCH] gnu: Add crawl. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26488@debbugs.gnu.org. --=20 26488: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26488 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1492806362-26415-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26488-done) by debbugs.gnu.org; 21 Apr 2017 20:25:49 +0000 Received: from localhost ([127.0.0.1]:32966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d1f7k-0006re-UE for submit@debbugs.gnu.org; Fri, 21 Apr 2017 16:25:49 -0400 Received: from o127.p9.mailjet.com ([87.253.234.127]:34033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <4e2babb3.AEAAJVZanZ0AAAAAAAAAAAO3B-sAAAACwQwAAAAAAAW9WABY-mrJ@bnc3.mailjet.com>) id 1d1f7i-0006rV-TW for 26488-done@debbugs.gnu.org; Fri, 21 Apr 2017 16:25:47 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=2guD8B1UGoAYuegfTE1CbX8pcpU=; b=ql22Qeni3+wcPkmINS+d5PBYjkfUtn/z/U/TiX7ifxqVWBwqyKb3X4TPV R2tYTfXz+ypGQR+W6YWH9+m1MQgxH9D+1Wf+l3WVTTUSQ0pwsNPw8g4J4MFw q3GmxgxQVoAQgzees87QhbQTbcQy13miW5TfQZH7X+dovqWFNxr1OY= Message-Id: <4e2babb3.AEAAJVZanZ0AAAAAAAAAAAO3B-sAAAACwQwAAAAAAAW9WABY-mrJ@mailjet.com> MIME-Version: 1.0 From: Arun Isaac To: 26488-done@debbugs.gnu.org Subject: Re: bug#26488: [PATCH] gnu: Add crawl. Date: Sat, 22 Apr 2017 01:55:31 +0530 In-reply-to: <878tmt7klq.fsf@dustycloud.org> References: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> <791d5ba7.AEQAJP3OyzEAAAAAAAAAAAO02gcAAAACwQwAAAAAAAW9WABY8IM9@mailjet.com> <8ac92fe4-14dd-3933-8901-bea4ff8673ac@cock.li> <43dae64d-8d60-8930-ce6b-12afd44fe787@cock.li> <878tmt7klq.fsf@dustycloud.org> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEAAJVZanZ0AAAAAAAAAAAO3B-sAAAACwQwAAAAAAAW9WABY-mrJEAVLmWyxTWe_5GhvgzzOoAAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 26488-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Christopher Allan Webber writes: > Arun Isaac writes: > >> Everything else LGTM! Only the graphical build remains now. > > I assume that the graphical build will inherit from the console version > anyway? So maybe the graphical build shouldn't hold up the console > version if this will take a while? What do you think? Alright, I have pushed crawl with a few changes. We can deal with the graphical build in a separate patch. = ------------=_1492806362-26415-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 13 Apr 2017 21:29:08 +0000 Received: from localhost ([127.0.0.1]:46169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cymId-0008MY-M0 for submit@debbugs.gnu.org; Thu, 13 Apr 2017 17:29:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cymG8-0008I7-0x for submit@debbugs.gnu.org; Thu, 13 Apr 2017 17:26:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cymG1-0000oC-J9 for submit@debbugs.gnu.org; Thu, 13 Apr 2017 17:26:26 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:60607) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cymG1-0000o8-FY for submit@debbugs.gnu.org; Thu, 13 Apr 2017 17:26:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cymFz-0001gi-Uo for guix-patches@gnu.org; Thu, 13 Apr 2017 17:26:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cymFv-0000mX-Ts for guix-patches@gnu.org; Thu, 13 Apr 2017 17:26:23 -0400 Received: from cock.li ([185.100.85.212]:57185) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cymFv-0000lm-GU for guix-patches@gnu.org; Thu, 13 Apr 2017 17:26:19 -0400 To: guix-patches@gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1492118776; bh=sbWmbU1ZeceTTPT9V6f8ouvwxhZJlkjjkh3VGe2skRo=; h=To:From:Subject:Date:From; b=mjavyytXiQZdXAoJqQ2c9o/05iO+UpOx7YGAQSF0WcZFAELS7SN8krEGMBBR8hKWq VyZA1LyGLGaCttJfyxBEGFv1iPVD/JNadBLovy1hFwsCHt/Yjiveo2dtCjmniw5TO8 pJMygvwGcbZnX6G5Alu6+CePQhYjv9BCxeXz4KTewLMbKtR9b0whTIAzQcbzypbOI4 2upCaGA4HqWLMx20InFV5xt4s2wbx6/HmL95vfxThOTVgiiMrAl5dq9FTahWA1aTWF 3STPifXPZrhZjlyoJ3X7vL7b5fb6cME0knOU4ryJJzCOGxXJBQczxbNtzcZt+tBcyK VlAgF03iWfM+Q== From: nee Subject: [PATCH] gnu: Add crawl. X-Enigmail-Draft-Status: N1110 Message-ID: <9758282d-96a4-8fe4-183b-a60a43a9eab9@cock.li> Date: Thu, 13 Apr 2017 23:26:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------DF81CA65153477EE1B39C72B" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Thu, 13 Apr 2017 17:29:06 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) This is a multi-part message in MIME format. --------------DF81CA65153477EE1B39C72B Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, this is just the console version for now. There is also a graphical version that I haven't build on the latest release, yet. * Multiple uris When crawl makes a new release they move the previous tar archive into a major-minor prefixed sub-directory. The current release only exists in the higher directory. I haven't seen any other package list multiple uris, so I hope I entered it correctly. I can only say that it builds, and got through guix lint like this. --------------DF81CA65153477EE1B39C72B Content-Type: text/x-patch; name="0001-gnu-Add-crawl.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-crawl.patch" =46rom fd456a6f73fff5a2b9348ca1e43bd61fdf79fc6c Mon Sep 17 00:00:00 2001 From: nee Date: Thu, 13 Apr 2017 22:45:18 +0200 Subject: [PATCH] gnu: Add crawl. * gnu/packages/games.scm (crawl): New variable. --- gnu/packages/games.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++= ++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 710b2746c..522ad5366 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -115,6 +115,8 @@ #:use-module (gnu packages messaging) #:use-module (gnu packages upnp) #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix build-system python) @@ -3649,3 +3651,68 @@ small robot living in the nano world, repair its m= aker.") ;; kiki-the-nano-bot/kiki-the-nano-bot_1.0.2+dfsg1-4_copyright> ;; for a statement from the author. (license license:public-domain))) + +(define-public crawl + (package + (name "crawl") + (version "0.19.5") + (source (origin + (method url-fetch) + (uri (list + ;; Older releases get moved into a versioned directo= ry + (string-append "http://crawl.develz.org/release/" + (version-major+minor version) "/stone= _soup-" + version "-nodeps.tar.xz") + ;; Only the latest release is in this directory + (string-append "http://crawl.develz.org/release/ston= e_soup-" + version "-nodeps.tar.xz"))) + (sha256 + (base32 + "00yl2lb2shglxlxzpyk99zvglfx4amjybqwnzdcasvbiggb4cj18"))= )) + (arguments + '(#:tests? #f + #:make-flags + (let* ((sqlite (assoc-ref %build-inputs "sqlite")) + (out (assoc-ref %outputs "out"))) + (list (string-append "sqlite=3D" sqlite) + (string-append "prefix=3D" out) + "SAVEDIR=3D~/.crawl" + "dejavu_fonts=3D" + "TILES=3D" + "BUILD_LUA=3D" + "BUILD_SQLITE=3D" + "BUILD_ZLIB=3D")) + #:phases + (modify-phases + %standard-phases + (add-after + 'unpack 'prepare-before-make + (lambda* (#:key inputs #:allow-other-keys) + (chdir "source"))) + (add-before + 'configure 'patch-makefile + (lambda* (#:key inputs #:allow-other-keys) + (substitute* + "Makefile" + (("SQLITE_INCLUDE_DIR :=3D /usr/include") + "SQLITE_INCLUDE_DIR :=3D ${sqlite}/include")) + (substitute* + "Makefile" + (("/usr/share/fonts /usr/local/share/fonts /usr/*/lib/X11/= fonts;") + "${dejavu_fonts}/share/fonts;")))) + (delete 'configure)))) + (build-system gnu-build-system) + (inputs `(("ncurses" ,ncurses) + ("sqlite" ,sqlite) + ("bison" ,bison) + ("flex" ,flex) + ("perl" ,perl) + ("zlib" ,zlib) + ("lua51" ,lua-5.1))) + (native-inputs `(("pkg-config" ,pkg-config))) + (synopsis "Roguelike dungeon crawler game") + (description "A roguelike adventure through dungeons filled with dan= gerous +monsters in a quest to find the mystifyingly fabulous Orb of Zot. +The game is also known under the name 'Dungeon Crawl Stone Soup'.") + (home-page "https://crawl.develz.org") + (license license:gpl2+))) --=20 2.12.2 --------------DF81CA65153477EE1B39C72B-- ------------=_1492806362-26415-1--