GNU bug report logs - #77886
[PATCH] gnu: Update openttd dependencies to fix its build

Previous Next

To reply to this bug, email your comments to 77886 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Mark L <cake <at> pydis.com>
To: guix-patches <at> gnu.org
Cc: Mark L <cake <at> pydis.com>, joe <at> pydis.wtf
Subject: [PATCH] gnu: Update openttd dependencies to fix its build
Date: Thu, 17 Apr 2025 21:19:58 +0200

The current version of `openttd-opengfx` has been released in September
2021.

This fixes a few issues with the build of `openttd-opengfx`:

- The make script would try to call `python` instead of `python3`.
- The make script would call `gimp`, but this seems like it broke during
  a Gimp update. A patch for this is in the later Git commits. Since the
  current and most recent version of `openttd-opengfx` has been released
  in September 2021, I've updated this to the latest commit on `master`
  so it can build.
- The older version of `nml` could not build it properly due to missing
  support for `ROAD_WAYPOINTS`.

Change-Id: Ie7b58e267f11d2de86c05c1ea9abcc4e8690eda1
---
 gnu/packages/game-development.scm |  9 ++-------
 gnu/packages/games.scm            | 16 ++++++++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 91369089b9..db45b64d41 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -545,19 +545,14 @@ (define-public gzochi
 (define-public nml
   (package
     (name "nml")
-    (version "0.7.2")
+    (version "0.7.6")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "nml" version))
        (sha256
-        (base32 "1kgzkv8pc0blck8c6iqq1idx1nrxyjw2vbnrdisnxizi6zds5l73"))))
+        (base32 "0if99hk9dsiw33iabkrbrpwybv8vl3hpim1cf07sklkshigwxryr"))))
     (build-system python-build-system)
-    ;; TODO: Fix test that fails with
-    ;; "AttributeError: partially initialized module 'nml.nmlop' has no
-    ;; attribute 'ADD' (most likely due to a circular import)"
-    (arguments
-     '(#:tests? #f))
     (propagated-inputs
      (list python-pillow python-ply))
     (home-page "https://github.com/OpenTTD/nml")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 07f199966a..7c1380bcae 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5238,15 +5238,16 @@ (define openttd-engine
 (define openttd-opengfx
   (package
     (name "openttd-opengfx")
-    (version "7.1")
+    (version "3739bbe9bdcd5bfbb2f720a99667f77d31caf02f")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://cdn.openttd.org/opengfx-releases/"
-                           version "/opengfx-" version "-source.tar.xz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/openttd/opengfx")
+             (commit version)))
        (sha256
         (base32
-         "0nhzlk6s73qvznm5fdwcs1b42g2plf26s5ag39fvck45zm7m48jk"))))
+         "03fhzlv4935868lxpdik7afz8cgsnzwr38a2blzmvy18c4lzc4m3"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -5254,7 +5255,10 @@ (define openttd-opengfx
       #~(list (string-append "CC=" #$(cc-for-target))
               (string-append "INSTALL_DIR="
                              #$output
-                             "/share/games/openttd/baseset/opengfx"))
+                             "/share/games/openttd/baseset/opengfx")
+              (string-append "PYTHON="
+                             #$(this-package-native-input "python")
+                             "bin/python"))
       #:phases
       #~(modify-phases %standard-phases
           (replace 'configure

base-commit: cc4b392a8303788762ed9adb9c5635cf227e58a2
-- 
2.39.5

Message #8 received at 77886 <at> debbugs.gnu.org (full text, mbox):

From: Mark L <cake <at> pydis.com>
To: 77886 <at> debbugs.gnu.org
Cc: Mark L <cake <at> pydis.com>, joe <at> pydis.wtf
Subject: [PATCH v2] gnu: Update openttd dependencies to fix its build
Date: Sun, 27 Apr 2025 17:46:36 +0200

The current version of `openttd-opengfx` has been released in September
2021.

This fixes a few issues with the build of `openttd-opengfx`:

- The make script would try to call `python` instead of `python3`.
- The make script would call `gimp`, but this seems like it broke during
  a Gimp update. A patch for this is in the later Git commits. Since the
  current and most recent version of `openttd-opengfx` has been released
  in September 2021, I've updated this to the latest commit on `master`
  so it can build.
- The older version of `nml` could not build it properly due to missing
  support for `ROAD_WAYPOINTS`.

Change-Id: Ie7b58e267f11d2de86c05c1ea9abcc4e8690eda1
---
 gnu/packages/game-development.scm |  9 ++-------
 gnu/packages/games.scm            | 17 +++++++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 91369089b9..db45b64d41 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -545,19 +545,14 @@ (define-public gzochi
 (define-public nml
   (package
     (name "nml")
-    (version "0.7.2")
+    (version "0.7.6")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "nml" version))
        (sha256
-        (base32 "1kgzkv8pc0blck8c6iqq1idx1nrxyjw2vbnrdisnxizi6zds5l73"))))
+        (base32 "0if99hk9dsiw33iabkrbrpwybv8vl3hpim1cf07sklkshigwxryr"))))
     (build-system python-build-system)
-    ;; TODO: Fix test that fails with
-    ;; "AttributeError: partially initialized module 'nml.nmlop' has no
-    ;; attribute 'ADD' (most likely due to a circular import)"
-    (arguments
-     '(#:tests? #f))
     (propagated-inputs
      (list python-pillow python-ply))
     (home-page "https://github.com/OpenTTD/nml")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 07f199966a..b3c5d122fe 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5238,15 +5238,16 @@ (define openttd-engine
 (define openttd-opengfx
   (package
     (name "openttd-opengfx")
-    (version "7.1")
+    (version "3739bbe9bdcd5bfbb2f720a99667f77d31caf02f")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://cdn.openttd.org/opengfx-releases/"
-                           version "/opengfx-" version "-source.tar.xz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/openttd/opengfx")
+             (commit version)))
        (sha256
         (base32
-         "0nhzlk6s73qvznm5fdwcs1b42g2plf26s5ag39fvck45zm7m48jk"))))
+         "03fhzlv4935868lxpdik7afz8cgsnzwr38a2blzmvy18c4lzc4m3"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -5254,7 +5255,11 @@ (define openttd-opengfx
       #~(list (string-append "CC=" #$(cc-for-target))
               (string-append "INSTALL_DIR="
                              #$output
-                             "/share/games/openttd/baseset/opengfx"))
+                             "/share/games/openttd/baseset/opengfx")
+              "REPO_DATE=20000101"
+              (string-append "PYTHON="
+                             #$(this-package-native-input "python")
+                             "/bin/python3"))
       #:phases
       #~(modify-phases %standard-phases
           (replace 'configure

base-commit: 54cc9c96ec0877b2afa24871c3acd8af27b0d500
-- 
2.39.5

Message #11 received at 77886 <at> debbugs.gnu.org (full text, mbox):

From: <cake <at> pydis.com>
To: <77886 <at> debbugs.gnu.org>
Cc: joe <at> pydis.wtf
Subject: Re: [PATCH v2] gnu: Update openttd dependencies to fix its build
Date: Sun, 27 Apr 2025 17:50:03 +0200

Hi all,

I just posted an amended patch: my previous patch actually did not set `PYTHON` properly.
Furthermore, there was an error in the Makefile. The build still worked, but I figured it would be nice to correct.

Now one issue is missing, it seems Gimp is trying to call `/usr/bin/env` but that's not present.
But as with the other issues, that doesn't seem like it breaks anything currently..

Message #14 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: cake--- via Guix-patches via <guix-patches <at> gnu.org>
Cc: joe <at> pydis.wtf, cake <at> pydis.com, 77886 <at> debbugs.gnu.org
Subject: Re: [bug#77886] [PATCH v2] gnu: Update openttd dependencies to fix
 its build
Date: Mon, 28 Apr 2025 08:08:01 +0100

[Message part 1 (text/plain, inline)]

cake--- via Guix-patches via <guix-patches <at> gnu.org> writes:

> Hi all,
>
> I just posted an amended patch: my previous patch actually did not set `PYTHON` properly.
> Furthermore, there was an error in the Makefile. The build still worked, but I figured it would be nice to correct.
>
> Now one issue is missing, it seems Gimp is trying to call `/usr/bin/env` but that's not present.
> But as with the other issues, that doesn't seem like it breaks anything currently..

Hi,

Would you be able to send some v3 patches, separating the changes out in
to one commit per package?

Thanks,

Chris

[signature.asc (application/pgp-signature, inline)]

Message #20 received at 77886 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Mark L <cake <at> pydis.com>, 77886 <at> debbugs.gnu.org
Cc: iyzsong <at> envs.net, adam.faiz <at> disroot.org, joe <at> pydis.wtf
Subject: Re: [bug#77886] [PATCH] gnu: Update openttd dependencies to fix its
 build
Date: Wed, 21 May 2025 07:09:35 +0200

Am Donnerstag, dem 17.04.2025 um 21:19 +0200 schrieb Mark L:
> The current version of `openttd-opengfx` has been released in
> September
> 2021.
> 
> This fixes a few issues with the build of `openttd-opengfx`:
> 
> - The make script would try to call `python` instead of `python3`.
> - The make script would call `gimp`, but this seems like it broke
> during
>   a Gimp update. A patch for this is in the later Git commits. Since
> the
>   current and most recent version of `openttd-opengfx` has been
> released
>   in September 2021, I've updated this to the latest commit on
> `master`
>   so it can build.
> - The older version of `nml` could not build it properly due to
> missing
>   support for `ROAD_WAYPOINTS`.
Note: please refer to our manual for the ChangeLog style.

> 
> Change-Id: Ie7b58e267f11d2de86c05c1ea9abcc4e8690eda1
> ---
>  gnu/packages/game-development.scm |  9 ++-------
>  gnu/packages/games.scm            | 16 ++++++++++------
>  2 files changed, 12 insertions(+), 13 deletions(-)
> 
> diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-
> development.scm
> index 91369089b9..db45b64d41 100644
> --- a/gnu/packages/game-development.scm
> +++ b/gnu/packages/game-development.scm
> @@ -545,19 +545,14 @@ (define-public gzochi
>  (define-public nml
>    (package
>      (name "nml")
> -    (version "0.7.2")
> +    (version "0.7.6")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (pypi-uri "nml" version))
>         (sha256
> -        (base32
> "1kgzkv8pc0blck8c6iqq1idx1nrxyjw2vbnrdisnxizi6zds5l73"))))
> +        (base32
> "0if99hk9dsiw33iabkrbrpwybv8vl3hpim1cf07sklkshigwxryr"))))
>      (build-system python-build-system)
> -    ;; TODO: Fix test that fails with
> -    ;; "AttributeError: partially initialized module 'nml.nmlop' has
> no
> -    ;; attribute 'ADD' (most likely due to a circular import)"
> -    (arguments
> -     '(#:tests? #f))
>      (propagated-inputs
>       (list python-pillow python-ply))
>      (home-page "https://github.com/OpenTTD/nml")
This should be a separate commit.

> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 07f199966a..7c1380bcae 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -5238,15 +5238,16 @@ (define openttd-engine
>  (define openttd-opengfx
>    (package
>      (name "openttd-opengfx")
> -    (version "7.1")
> +    (version "3739bbe9bdcd5bfbb2f720a99667f77d31caf02f")
Use git-version.  Let-bind revision and commit.
>      (source
>       (origin
> -       (method url-fetch)
> -       (uri (string-append
> "https://cdn.openttd.org/opengfx-releases/"
> -                           version "/opengfx-" version "-
> source.tar.xz"))
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://github.com/openttd/opengfx")
> +             (commit version)))
Use the let-bound commit mentioned above.
>         (sha256
>          (base32
> -         "0nhzlk6s73qvznm5fdwcs1b42g2plf26s5ag39fvck45zm7m48jk"))))
> +         "03fhzlv4935868lxpdik7afz8cgsnzwr38a2blzmvy18c4lzc4m3"))))
>      (build-system gnu-build-system)
>      (arguments
>       (list
> @@ -5254,7 +5255,10 @@ (define openttd-opengfx
>        #~(list (string-append "CC=" #$(cc-for-target))
>                (string-append "INSTALL_DIR="
>                               #$output
> -                            
> "/share/games/openttd/baseset/opengfx"))
> +                             "/share/games/openttd/baseset/opengfx")
> +              (string-append "PYTHON="
> +                             #$(this-package-native-input "python")
> +                             "bin/python"))
>        #:phases
>        #~(modify-phases %standard-phases
>            (replace 'configure
> 
> base-commit: cc4b392a8303788762ed9adb9c5635cf227e58a2

Cheers

Message #25 received at 77886-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Christopher Baines <mail <at> cbaines.net>
Cc: 77886-done <at> debbugs.gnu.org, cake <at> pydis.com, joe <at> pydis.wtf
Subject: Re: bug#77886: [PATCH] gnu: Update openttd dependencies to fix its
 build
Date: Wed, 04 Jun 2025 16:22:34 +0200

Pushed after addressing the various cosmetic issues.

Ludo'.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.