[bug#42354] [PATCH] gnu: open-adventure: Update to 1.8.

[bug#42354] [PATCH] gnu: open-adventure: Update to 1.8.

[Nicolas Goaziou]

* 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

[bug#42354] [PATCH] gnu: open-adventure: Update to 1.8.

[Ludovic Courtès]

Hi,

Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:

> * 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.

Oh weird.  As it stands, ‘guix upgrade’ 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’.

[bug#42354] [PATCH] gnu: open-adventure: Update to 1.8.

[Ludovic Courtès]

Ping!

Ludovic Courtès <ludo@gnu.org> skribis:

> Hi,
>
> Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:
>
>> * 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.
>
> Oh weird.  As it stands, ‘guix upgrade’ 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’.

[bug#42354] [PATCH] gnu: open-adventure: Update to 1.8.

[Nicolas Goaziou]

Hello,

Ludovic Courtès <ludo@gnu.org> 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,
-- 
Nicolas Goaziou

[bug#42354] [PATCH] gnu: open-adventure: Update to 1.8.

[Ludovic Courtès]

Hi,

Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:

> Ludovic Courtès <ludo@gnu.org> 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 ‘deprecated-package’.

HTH!

Ludo’.

[bug#42354] [PATCH] gnu: open-adventure: Update to 1.8.

[Nicolas Goaziou]

Hello,

Ludovic Courtès <ludo@gnu.org> writes:

> Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:
>
>> Ludovic Courtès <ludo@gnu.org> 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 ‘deprecated-package’.
>
> 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,
-- 
Nicolas Goaziou

[bug#42354] [PATCH] gnu: open-adventure: Update to 1.8.

[Ludovic Courtès]

Hi,

Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:

>> Yes, see ‘deprecated-package’.
>>
>> 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’re 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 “guix install open-adventure@1.8” will emit a deprecation
warning and install the other one.

HTH!

Ludo’.

[bug#42354] [PATCH] gnu: open-adventure: Update to 1.8.

[Nicolas Goaziou]

Hello,

Ludovic Courtès <ludo@gnu.org> writes:

> Ah well, not exactly with this function, you’re 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 “guix install open-adventure@1.8” will emit a deprecation
> 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,
-- 
Nicolas Goaziou

[bug#42354] [PATCH] gnu: open-adventure: Update to 1.8.

[Ludovic Courtès]

Hi,

Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Ah well, not exactly with this function, you’re 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 “guix install open-adventure@1.8” will emit a deprecation
>> 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, “guix upgrade open-adventure” will “downgrade” to 1.8 if
you currently have 2.5.

Ludo’.

[bug#42354] [PATCH] gnu: open-adventure: Update to 1.9.

[Nicolas Goaziou]

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

Hello,

What about the following patch?

Regards,

-- 
Nicolas Goaziou

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: update open-adventure to 1.9 --]
[-- Type: text/x-diff, Size: 6357 bytes --]

From e727bcc31d26d509a18ef022a282cd4fd6a11bc0 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
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

bug#42354: [PATCH] gnu: open-adventure: Update to 1.9.

[Nicolas Goaziou]

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

> Subject: [PATCH] gnu: open-adventure: Update to 1.9.

Applied. Closing.