From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 14 10:44:35 2020 Received: (at submit) by debbugs.gnu.org; 14 Jul 2020 14:44:35 +0000 Received: from localhost ([127.0.0.1]:51293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jvMAd-0000SL-9x for submit@debbugs.gnu.org; Tue, 14 Jul 2020 10:44:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:41742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jvMAa-0000S8-9w for submit@debbugs.gnu.org; Tue, 14 Jul 2020 10:44:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvMAa-00019U-1S for guix-patches@gnu.org; Tue, 14 Jul 2020 10:44:32 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:52279) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvMAX-0002y2-E2 for guix-patches@gnu.org; Tue, 14 Jul 2020 10:44:31 -0400 Received: from saiph.lan (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 85157100009 for ; Tue, 14 Jul 2020 14:44:25 +0000 (UTC) From: Nicolas Goaziou To: guix-patches@gnu.org Subject: [PATCH] gnu: open-adventure: Update to 1.8. Date: Tue, 14 Jul 2020 16:44:24 +0200 Message-Id: <20200714144424.20954-1-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.178.231; envelope-from=mail@nicolasgoaziou.fr; helo=relay11.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/14 10:44:25 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit 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.6 (--) * gnu/packages/games.scm (open-adventure): Update to 1.8. [arguments]: Re-activate parallel build. Remove configure phase altogether. [native-inputs]: Remove linenoise and python. Add libedit, python-wrapper, and pkg-config. [description]: Slight rewording. The package is erroneously versioned as 2.5, which refers to the last release of the original game. However, this is a forward-port with its own versioning scheme. --- gnu/packages/games.scm | 116 +++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 63 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5de6dbf4ac..7cc3048ee8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6342,71 +6342,61 @@ at their peak of economic growth and military prowess. license:mpl2.0 license:zlib)))) -;; There have been no official releases. (define-public open-adventure - (let* ((commit "d43854f0f6bb8e9eea7fbce80348150e7e7fc34d") - (revision "2")) - (package - (name "open-adventure") - (version (string-append "2.5-" revision "." (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/esr/open-adventure") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "08bwrvf4axb1rsfd6ia1fddsky9pc1p350vjskhaakg2czc6dsk0")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags (list "CC=gcc") - #:parallel-build? #f ; not supported - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Linenoise is meant to be included, so we have to - ;; copy it into the working directory. - (let* ((linenoise (assoc-ref inputs "linenoise")) - (noisepath (string-append linenoise "/include/linenoise")) - (out (assoc-ref outputs "out"))) - (copy-recursively noisepath "linenoise")) - #t)) - (add-before 'build 'use-echo - (lambda _ - (substitute* "tests/Makefile" - (("/bin/echo") (which "echo"))) - #t)) - (add-after 'build 'build-manpage - (lambda _ - ;; This target is missing a dependency - (substitute* "Makefile" - ((".adoc.6:" line) - (string-append line " advent.adoc"))) - (invoke "make" ".adoc.6"))) - ;; There is no install target - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (man (string-append out "/share/man/man6"))) - (install-file "advent" bin) - (install-file "advent.6" man)) - #t))))) - (native-inputs - `(("asciidoc" ,asciidoc) - ("linenoise" ,linenoise) - ("python" ,python) - ("python-pyyaml" ,python-pyyaml))) - (home-page "https://gitlab.com/esr/open-adventure") - (synopsis "Colossal Cave Adventure") - (description "The original Colossal Cave Adventure from 1976 was the -origin of all text adventures, dungeon-crawl (computer) games, and -computer-hosted roleplaying games. This is the last version released by + (package + (name "open-adventure") + (version "1.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/esr/open-adventure") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12h1n6n4g6izsyb8b3iqxqmhv3sa9ipwnc8ycqn9qsrs2601ry32")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-before 'build 'use-echo + (lambda _ + (substitute* "tests/Makefile" + (("/bin/echo") (which "echo"))) + #t)) + (add-after 'build 'build-manpage + (lambda _ + ;; This target is missing a dependency + (substitute* "Makefile" + ((".adoc.6:" line) + (string-append line " advent.adoc"))) + (invoke "make" ".adoc.6"))) + ;; There is no install target. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man6"))) + (install-file "advent" bin) + (install-file "advent.6" man)) + #t))))) + (native-inputs + `(("asciidoc" ,asciidoc) + ("libedit" ,libedit) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("python-pyyaml" ,python-pyyaml))) + (home-page "https://gitlab.com/esr/open-adventure") + (synopsis "Colossal Cave Adventure") + (description + "The original Colossal Cave Adventure from 1976 was the origin of all +text adventures, dungeon-crawl (computer) games, and computer-hosted +roleplaying games. This is a forward port of the last version released by Crowther & Woods, its original authors, in 1995. It has been known as -\"adventure 2.5\" and \"430-point adventure\".") - (license license:bsd-2)))) +``adventure 2.5'' and ``430-point adventure''.") + (license license:bsd-2))) (define-public tome4 (package -- 2.27.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 21 12:37:38 2020 Received: (at 42354) by debbugs.gnu.org; 21 Jul 2020 16:37:38 +0000 Received: from localhost ([127.0.0.1]:40208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxvGs-0002r3-38 for submit@debbugs.gnu.org; Tue, 21 Jul 2020 12:37:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jxvGp-0002qo-Uh for 42354@debbugs.gnu.org; Tue, 21 Jul 2020 12:37:36 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60039) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxvGk-0000Jm-3s; Tue, 21 Jul 2020 12:37:30 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=55878 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jxvGj-0003mu-CU; Tue, 21 Jul 2020 12:37:29 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Nicolas Goaziou Subject: Re: [bug#42354] [PATCH] gnu: open-adventure: Update to 1.8. References: <20200714144424.20954-1-mail@nicolasgoaziou.fr> Date: Tue, 21 Jul 2020 18:37:27 +0200 In-Reply-To: <20200714144424.20954-1-mail@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Tue, 14 Jul 2020 16:44:24 +0200") Message-ID: <87r1t4n7so.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42354 Cc: 42354@debbugs.gnu.org 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: -3.3 (---) Hi, Nicolas Goaziou skribis: > * gnu/packages/games.scm (open-adventure): Update to 1.8. > [arguments]: Re-activate parallel build. Remove configure phase altogeth= er. > [native-inputs]: Remove linenoise and python. Add libedit, python-wrappe= r, > and pkg-config. > [description]: Slight rewording. > > The package is erroneously versioned as 2.5, which refers to the last rel= ease > of the original game. However, this is a forward-port with its own versio= ning > scheme. Oh weird. As it stands, =E2=80=98guix upgrade=E2=80=99 would not upgrade i= t because the new version number is lower than the old one. But perhaps we can define an open-adventure 2.5 package marked as superseded by 1.8. Apart from that, LGTM! Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 07 10:00:03 2020 Received: (at 42354) by debbugs.gnu.org; 7 Sep 2020 14:00:04 +0000 Received: from localhost ([127.0.0.1]:50306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFHgh-00017n-D9 for submit@debbugs.gnu.org; Mon, 07 Sep 2020 10:00:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFHgf-00016r-Rp for 42354@debbugs.gnu.org; Mon, 07 Sep 2020 10:00:02 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42440) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFHga-0003au-27; Mon, 07 Sep 2020 09:59:56 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=44440 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kFHgZ-0005uV-L9; Mon, 07 Sep 2020 09:59:55 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Nicolas Goaziou Subject: Re: [bug#42354] [PATCH] gnu: open-adventure: Update to 1.8. References: <20200714144424.20954-1-mail@nicolasgoaziou.fr> <87r1t4n7so.fsf@gnu.org> Date: Mon, 07 Sep 2020 15:59:50 +0200 In-Reply-To: <87r1t4n7so.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 21 Jul 2020 18:37:27 +0200") Message-ID: <87wo15hell.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42354 Cc: 42354@debbugs.gnu.org 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: -3.3 (---) Ping! Ludovic Court=C3=A8s skribis: > Hi, > > Nicolas Goaziou skribis: > >> * gnu/packages/games.scm (open-adventure): Update to 1.8. >> [arguments]: Re-activate parallel build. Remove configure phase altoget= her. >> [native-inputs]: Remove linenoise and python. Add libedit, python-wrapp= er, >> and pkg-config. >> [description]: Slight rewording. >> >> The package is erroneously versioned as 2.5, which refers to the last re= lease >> of the original game. However, this is a forward-port with its own versi= oning >> scheme. > > Oh weird. As it stands, =E2=80=98guix upgrade=E2=80=99 would not upgrade= it because the > new version number is lower than the old one. > > But perhaps we can define an open-adventure 2.5 package marked as > superseded by 1.8. > > Apart from that, LGTM! > > Thanks, > Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 07 15:24:11 2020 Received: (at 42354) by debbugs.gnu.org; 7 Sep 2020 19:24:11 +0000 Received: from localhost ([127.0.0.1]:50899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFMkN-0005Vs-Gp for submit@debbugs.gnu.org; Mon, 07 Sep 2020 15:24:11 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:42053) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFMkL-0005Vf-PB for 42354@debbugs.gnu.org; Mon, 07 Sep 2020 15:24:10 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 33A00FF803; Mon, 7 Sep 2020 19:24:02 +0000 (UTC) From: Nicolas Goaziou To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#42354] [PATCH] gnu: open-adventure: Update to 1.8. In-Reply-To: <87wo15hell.fsf@gnu.org> References: <20200714144424.20954-1-mail@nicolasgoaziou.fr> <87r1t4n7so.fsf@gnu.org> <87wo15hell.fsf@gnu.org> Date: Mon, 07 Sep 2020 21:24:02 +0200 Message-ID: <87mu21qtkd.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42354 Cc: 42354@debbugs.gnu.org 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: -1.0 (-) Hello, Ludovic Court=C3=A8s writes: >> But perhaps we can define an open-adventure 2.5 package marked as >> superseded by 1.8. I don't know how to do the above. Do you have any pointer? Regards, --=20 Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 08 11:46:53 2020 Received: (at 42354) by debbugs.gnu.org; 8 Sep 2020 15:46:53 +0000 Received: from localhost ([127.0.0.1]:56087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFfpd-00044p-Bp for submit@debbugs.gnu.org; Tue, 08 Sep 2020 11:46:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFfpc-00044b-1G for 42354@debbugs.gnu.org; Tue, 08 Sep 2020 11:46:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42395) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFfpV-0002g5-I0; Tue, 08 Sep 2020 11:46:45 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=37898 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kFfpV-00023G-0X; Tue, 08 Sep 2020 11:46:45 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Nicolas Goaziou Subject: Re: [bug#42354] [PATCH] gnu: open-adventure: Update to 1.8. References: <20200714144424.20954-1-mail@nicolasgoaziou.fr> <87r1t4n7so.fsf@gnu.org> <87wo15hell.fsf@gnu.org> <87mu21qtkd.fsf@nicolasgoaziou.fr> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 23 Fructidor an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 08 Sep 2020 17:46:39 +0200 In-Reply-To: <87mu21qtkd.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Mon, 07 Sep 2020 21:24:02 +0200") Message-ID: <875z8op8yo.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42354 Cc: 42354@debbugs.gnu.org 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: -3.3 (---) Hi, Nicolas Goaziou skribis: > Ludovic Court=C3=A8s writes: > >>> But perhaps we can define an open-adventure 2.5 package marked as >>> superseded by 1.8. > > I don't know how to do the above. Do you have any pointer? Yes, see =E2=80=98deprecated-package=E2=80=99. HTH! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 09 15:39:41 2020 Received: (at 42354) by debbugs.gnu.org; 9 Sep 2020 19:39:41 +0000 Received: from localhost ([127.0.0.1]:34774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kG5wT-0006FG-D9 for submit@debbugs.gnu.org; Wed, 09 Sep 2020 15:39:41 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:30689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kG5wQ-0006F2-TW for 42354@debbugs.gnu.org; Wed, 09 Sep 2020 15:39:40 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id CCCEB240004; Wed, 9 Sep 2020 19:39:31 +0000 (UTC) From: Nicolas Goaziou To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#42354] [PATCH] gnu: open-adventure: Update to 1.8. References: <20200714144424.20954-1-mail@nicolasgoaziou.fr> <87r1t4n7so.fsf@gnu.org> <87wo15hell.fsf@gnu.org> <87mu21qtkd.fsf@nicolasgoaziou.fr> <875z8op8yo.fsf@gnu.org> Date: Wed, 09 Sep 2020 21:39:30 +0200 In-Reply-To: <875z8op8yo.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Tue, 08 Sep 2020 17:46:39 +0200") Message-ID: <87363qn3il.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42354 Cc: 42354@debbugs.gnu.org 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: -1.0 (-) Hello, Ludovic Court=C3=A8s writes: > Nicolas Goaziou skribis: > >> Ludovic Court=C3=A8s writes: >> >>>> But perhaps we can define an open-adventure 2.5 package marked as >>>> superseded by 1.8. >> >> I don't know how to do the above. Do you have any pointer? > > Yes, see =E2=80=98deprecated-package=E2=80=99. > > HTH! But you cannot deprecate a specific version of a package with this function, or can you? I think you lost me here, sorry. Regards, --=20 Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 10 03:46:42 2020 Received: (at 42354) by debbugs.gnu.org; 10 Sep 2020 07:46:42 +0000 Received: from localhost ([127.0.0.1]:35867 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kGHI2-0003gf-0X for submit@debbugs.gnu.org; Thu, 10 Sep 2020 03:46:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kGHI0-0003gU-Vf for 42354@debbugs.gnu.org; Thu, 10 Sep 2020 03:46:41 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52349) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGHHv-0007Qe-6u; Thu, 10 Sep 2020 03:46:35 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=40130 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kGHHu-00071M-Pq; Thu, 10 Sep 2020 03:46:35 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Nicolas Goaziou Subject: Re: [bug#42354] [PATCH] gnu: open-adventure: Update to 1.8. References: <20200714144424.20954-1-mail@nicolasgoaziou.fr> <87r1t4n7so.fsf@gnu.org> <87wo15hell.fsf@gnu.org> <87mu21qtkd.fsf@nicolasgoaziou.fr> <875z8op8yo.fsf@gnu.org> <87363qn3il.fsf@nicolasgoaziou.fr> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 25 Fructidor an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 10 Sep 2020 09:46:26 +0200 In-Reply-To: <87363qn3il.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Wed, 09 Sep 2020 21:39:30 +0200") Message-ID: <87sgbqjcq5.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42354 Cc: 42354@debbugs.gnu.org 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: -3.3 (---) Hi, Nicolas Goaziou skribis: >> Yes, see =E2=80=98deprecated-package=E2=80=99. >> >> HTH! > > But you cannot deprecate a specific version of a package with this > function, or can you? Ah well, not exactly with this function, you=E2=80=99re right, but I think = you can do something like: (define-public open-adventure-1.8 (package (inherit open-adventure) (version "1.8") (properties `((superseded . ,open-adventure))))) That way =E2=80=9Cguix install open-adventure@1.8=E2=80=9D will emit a depr= ecation warning and install the other one. HTH! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 13 09:47:04 2020 Received: (at 42354) by debbugs.gnu.org; 13 Sep 2020 13:47:04 +0000 Received: from localhost ([127.0.0.1]:49771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHSLP-0008Vf-Rp for submit@debbugs.gnu.org; Sun, 13 Sep 2020 09:47:04 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:39779) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHSLK-0008NW-Rn for 42354@debbugs.gnu.org; Sun, 13 Sep 2020 09:47:02 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 8E2B61C0003; Sun, 13 Sep 2020 13:46:52 +0000 (UTC) From: Nicolas Goaziou To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#42354] [PATCH] gnu: open-adventure: Update to 1.8. References: <20200714144424.20954-1-mail@nicolasgoaziou.fr> <87r1t4n7so.fsf@gnu.org> <87wo15hell.fsf@gnu.org> <87mu21qtkd.fsf@nicolasgoaziou.fr> <875z8op8yo.fsf@gnu.org> <87363qn3il.fsf@nicolasgoaziou.fr> <87sgbqjcq5.fsf@gnu.org> Date: Sun, 13 Sep 2020 15:46:51 +0200 In-Reply-To: <87sgbqjcq5.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Thu, 10 Sep 2020 09:46:26 +0200") Message-ID: <87tuw1g56c.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 42354 Cc: 42354@debbugs.gnu.org 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: -1.0 (-) Hello, Ludovic Court=C3=A8s writes: > Ah well, not exactly with this function, you=E2=80=99re right, but I thin= k you > can do something like: > > (define-public open-adventure-1.8 > (package > (inherit open-adventure) > (version "1.8") > (properties `((superseded . ,open-adventure))))) > > That way =E2=80=9Cguix install open-adventure@1.8=E2=80=9D will emit a de= precation > warning and install the other one. Thank you. However, wouldn't this do the exact opposite to what we want to achieve? We want to - "guix install open-adventure" and get open-adventure 1.8, not 2.5, - "guix upgrade open-adventure" and have open-adventure 1.8 override 2.5. Do you mean this instead? (define-public open-adventure-2.5 (package (inherit open-adventure) (version "1.8") (properties `((superseded . ,open-adventure))))) Meanwhile, I updated Open adventure to 1.9 in my patch. Regards, --=20 Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 13 16:58:30 2020 Received: (at 42354) by debbugs.gnu.org; 13 Sep 2020 20:58:30 +0000 Received: from localhost ([127.0.0.1]:51887 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHZ4q-0005Pd-HS for submit@debbugs.gnu.org; Sun, 13 Sep 2020 16:58:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHZ4m-0005PN-NB for 42354@debbugs.gnu.org; Sun, 13 Sep 2020 16:58:23 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38149) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHZ4g-000150-4K; Sun, 13 Sep 2020 16:58:14 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=47916 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kHZ4f-0004QP-2e; Sun, 13 Sep 2020 16:58:13 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Nicolas Goaziou Subject: Re: [bug#42354] [PATCH] gnu: open-adventure: Update to 1.8. References: <20200714144424.20954-1-mail@nicolasgoaziou.fr> <87r1t4n7so.fsf@gnu.org> <87wo15hell.fsf@gnu.org> <87mu21qtkd.fsf@nicolasgoaziou.fr> <875z8op8yo.fsf@gnu.org> <87363qn3il.fsf@nicolasgoaziou.fr> <87sgbqjcq5.fsf@gnu.org> <87tuw1g56c.fsf@nicolasgoaziou.fr> Date: Sun, 13 Sep 2020 22:58:03 +0200 In-Reply-To: <87tuw1g56c.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Sun, 13 Sep 2020 15:46:51 +0200") Message-ID: <87363lbdic.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42354 Cc: 42354@debbugs.gnu.org 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: -3.3 (---) Hi, Nicolas Goaziou skribis: > Ludovic Court=C3=A8s writes: > >> Ah well, not exactly with this function, you=E2=80=99re right, but I thi= nk you >> can do something like: >> >> (define-public open-adventure-1.8 >> (package >> (inherit open-adventure) >> (version "1.8") >> (properties `((superseded . ,open-adventure))))) >> >> That way =E2=80=9Cguix install open-adventure@1.8=E2=80=9D will emit a d= eprecation >> warning and install the other one. > > Thank you. However, wouldn't this do the exact opposite to what we want > to achieve? > > We want to > - "guix install open-adventure" and get open-adventure 1.8, not 2.5, > - "guix upgrade open-adventure" and have open-adventure 1.8 override > 2.5. > > Do you mean this instead? > > (define-public open-adventure-2.5 > (package > (inherit open-adventure) > (version "1.8") ^ Should be 2.5. > (properties `((superseded . ,open-adventure))))) That way, =E2=80=9Cguix upgrade open-adventure=E2=80=9D will =E2=80=9Cdowng= rade=E2=80=9D to 1.8 if you currently have 2.5. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 25 08:39:42 2020 Received: (at 42354) by debbugs.gnu.org; 25 Sep 2020 12:39:42 +0000 Received: from localhost ([127.0.0.1]:43000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLn0n-0007ex-Nr for submit@debbugs.gnu.org; Fri, 25 Sep 2020 08:39:42 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:51479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLn0l-0007ej-Gb for 42354@debbugs.gnu.org; Fri, 25 Sep 2020 08:39:40 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id AAFC22000E for <42354@debbugs.gnu.org>; Fri, 25 Sep 2020 12:39:32 +0000 (UTC) From: Nicolas Goaziou To: 42354@debbugs.gnu.org Subject: [PATCH] gnu: open-adventure: Update to 1.9. Date: Fri, 25 Sep 2020 14:39:24 +0200 Message-ID: <871riq6ner.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 42354 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: -1.0 (-) --=-=-= Content-Type: text/plain Hello, What about the following patch? Regards, -- Nicolas Goaziou --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-open-adventure-Update-to-1.9.patch Content-Description: update open-adventure to 1.9 >From e727bcc31d26d509a18ef022a282cd4fd6a11bc0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 13 Sep 2020 15:40:38 +0200 Subject: [PATCH] gnu: open-adventure: Update to 1.9. * gnu/packages/games.scm (open-adventure): Update to 1.9. [arguments]: Re-activate parallel build. Remove configure phase altogether. [native-inputs]: Remove linenoise and python. Add libedit, python-wrapper, and pkg-config. [description]: Slight rewording. (open-adventure-2.5): Deprecate in favor of open-adventure. The package is erroneously versioned as 2.5, which refers to the last release of the original game. However, this is a forward-port with its own versioning scheme. --- gnu/packages/games.scm | 122 ++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 63 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b819cd104f..cd8e3ccb1b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6376,71 +6376,67 @@ at their peak of economic growth and military prowess. license:mpl2.0 license:zlib)))) -;; There have been no official releases. (define-public open-adventure - (let* ((commit "d43854f0f6bb8e9eea7fbce80348150e7e7fc34d") - (revision "2")) - (package - (name "open-adventure") - (version (string-append "2.5-" revision "." (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/esr/open-adventure") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "08bwrvf4axb1rsfd6ia1fddsky9pc1p350vjskhaakg2czc6dsk0")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags (list "CC=gcc") - #:parallel-build? #f ; not supported - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Linenoise is meant to be included, so we have to - ;; copy it into the working directory. - (let* ((linenoise (assoc-ref inputs "linenoise")) - (noisepath (string-append linenoise "/include/linenoise")) - (out (assoc-ref outputs "out"))) - (copy-recursively noisepath "linenoise")) - #t)) - (add-before 'build 'use-echo - (lambda _ - (substitute* "tests/Makefile" - (("/bin/echo") (which "echo"))) - #t)) - (add-after 'build 'build-manpage - (lambda _ - ;; This target is missing a dependency - (substitute* "Makefile" - ((".adoc.6:" line) - (string-append line " advent.adoc"))) - (invoke "make" ".adoc.6"))) - ;; There is no install target - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (man (string-append out "/share/man/man6"))) - (install-file "advent" bin) - (install-file "advent.6" man)) - #t))))) - (native-inputs - `(("asciidoc" ,asciidoc) - ("linenoise" ,linenoise) - ("python" ,python) - ("python-pyyaml" ,python-pyyaml))) - (home-page "https://gitlab.com/esr/open-adventure") - (synopsis "Colossal Cave Adventure") - (description "The original Colossal Cave Adventure from 1976 was the -origin of all text adventures, dungeon-crawl (computer) games, and -computer-hosted roleplaying games. This is the last version released by + (package + (name "open-adventure") + (version "1.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/esr/open-adventure") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "123svzy7xczdklx6plbafp22yv9bcvwfibjk0jv2c9i22dfsr07f")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-before 'build 'use-echo + (lambda _ + (substitute* "tests/Makefile" + (("/bin/echo") (which "echo"))) + #t)) + (add-after 'build 'build-manpage + (lambda _ + ;; This target is missing a dependency + (substitute* "Makefile" + ((".adoc.6:" line) + (string-append line " advent.adoc"))) + (invoke "make" ".adoc.6"))) + ;; There is no install target. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man6"))) + (install-file "advent" bin) + (install-file "advent.6" man)) + #t))))) + (native-inputs + `(("asciidoc" ,asciidoc) + ("libedit" ,libedit) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("python-pyyaml" ,python-pyyaml))) + (home-page "https://gitlab.com/esr/open-adventure") + (synopsis "Colossal Cave Adventure") + (description + "The original Colossal Cave Adventure from 1976 was the origin of all +text adventures, dungeon-crawl (computer) games, and computer-hosted +roleplaying games. This is a forward port of the last version released by Crowther & Woods, its original authors, in 1995. It has been known as -\"adventure 2.5\" and \"430-point adventure\".") - (license license:bsd-2)))) +``adventure 2.5'' and ``430-point adventure''.") + (license license:bsd-2))) + +(define-public open-adventure-2.5 + (package + (inherit open-adventure) + (version "2.5") + (properties `((superseded . ,open-adventure))))) (define-public tome4 (package -- 2.28.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 26 12:38:38 2020 Received: (at 42354-done) by debbugs.gnu.org; 26 Nov 2020 17:38:38 +0000 Received: from localhost ([127.0.0.1]:42782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiLE6-00014T-BH for submit@debbugs.gnu.org; Thu, 26 Nov 2020 12:38:38 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:35187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kiLE1-00014C-OI for 42354-done@debbugs.gnu.org; Thu, 26 Nov 2020 12:38:36 -0500 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id EEBF5FF805 for <42354-done@debbugs.gnu.org>; Thu, 26 Nov 2020 17:38:26 +0000 (UTC) From: Nicolas Goaziou To: 42354-done@debbugs.gnu.org Subject: Re: [bug#42354] [PATCH] gnu: open-adventure: Update to 1.9. References: <20200714144424.20954-1-mail@nicolasgoaziou.fr> <871riq6ner.fsf@nicolasgoaziou.fr> Date: Thu, 26 Nov 2020 18:38:25 +0100 In-Reply-To: <871riq6ner.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Fri, 25 Sep 2020 14:39:24 +0200") Message-ID: <87mtz481da.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 42354-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: -1.0 (-) Nicolas Goaziou writes: > Subject: [PATCH] gnu: open-adventure: Update to 1.9. Applied. Closing. From unknown Mon Jun 23 04:13:24 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 25 Dec 2020 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator