[bug#55485] [PATCH] gnu: wla-dx: Update to 10.1.

[bug#55485] [PATCH] gnu: wla-dx: Update to 10.1.

[Felix Gruber]

* gnu/packages/assembly.scm (wla-dx): Update to 10.1.
[native-inputs]: Use new style.
---
 gnu/packages/assembly.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index b2830716e1..534cffd7df 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -342,7 +342,7 @@ package for the Game Boy and Game Boy Color.  It consists of:
 (define-public wla-dx
   (package
     (name "wla-dx")
-    (version "9.12")
+    (version "10.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -351,10 +351,9 @@ package for the Game Boy and Game Boy Color.  It consists of:
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1wlbqv2rgk9q6m9an1mi0i29250zl8lw7zipki2bbi9mczpyczli"))))
+                "1nh2k2xn5fj389gq68f3fxgrxakgn8c6dw2ffqay86s3706hac9w"))))
     (build-system cmake-build-system)
-    (native-inputs
-     `(("sphinx" ,python-sphinx)))      ; to generate man pages
+    (native-inputs (list python-sphinx)) ; to generate man pages
     (arguments
      `(#:tests? #f))                    ; no tests
     (home-page "https://github.com/vhelin/wla-dx")
-- 
2.30.2

[bug#55485] [PATCH] gnu: wla-dx: Update to 10.1.

[Maxime Devos]

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

Felix Gruber schreef op di 17-05-2022 om 17:24 [+0000]:
>       `(#:tests? #f))                    ; no tests

10.1 appears to have lots of tests in
<https://github.com/vhelin/wla-dx/tree/v10.1/tests>.

It looks like you can run them with run_tests.sh:

https://github.com/vhelin/wla-dx/blob/master/run_tests.sh

Greetings,
Maxime. 

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55485] [PATCH] gnu: wla-dx: Update to 10.1.

[Felix Gruber]

Hi Maxime,

On 5/17/22 20:02, Maxime Devos wrote:
> Felix Gruber schreef op di 17-05-2022 om 17:24 [+0000]:
>>        `(#:tests? #f))                    ; no tests
> 
> 10.1 appears to have lots of tests in
> <https://github.com/vhelin/wla-dx/tree/v10.1/tests>.
> 
> It looks like you can run them with run_tests.sh:
> 
> https://github.com/vhelin/wla-dx/blob/master/run_tests.sh

Thanks for the hint. I'll send a new patch that uses this run_tests.sh 
script in its 'check phase.

Kind regards,
Felix

[bug#55485] [PATCH v2] gnu: wla-dx: Update to 10.1.

[Felix Gruber]

* gnu/packages/assembly.scm (wla-dx): Update to 10.1.
[native-inputs]: Use new style.
[arguments]: Add custom 'check phase to run run_tests.sh.
---
 gnu/packages/assembly.scm | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index b2830716e1..ca50b00a06 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -342,7 +343,7 @@ package for the Game Boy and Game Boy Color.  It consists of:
 (define-public wla-dx
   (package
     (name "wla-dx")
-    (version "9.12")
+    (version "10.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -351,12 +352,20 @@ package for the Game Boy and Game Boy Color.  It consists of:
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1wlbqv2rgk9q6m9an1mi0i29250zl8lw7zipki2bbi9mczpyczli"))))
+                "1nh2k2xn5fj389gq68f3fxgrxakgn8c6dw2ffqay86s3706hac9w"))))
     (build-system cmake-build-system)
-    (native-inputs
-     `(("sphinx" ,python-sphinx)))      ; to generate man pages
+    (native-inputs (list python-sphinx)) ; to generate man pages
     (arguments
-     `(#:tests? #f))                    ; no tests
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'copy-tests-to-build-directory
+           (lambda _
+             (copy-recursively "../source/tests" "tests")))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (let ((sh (which "sh")))
+               (when tests?
+                 (invoke sh "../source/run_tests.sh"))))))))
     (home-page "https://github.com/vhelin/wla-dx")
     (synopsis "Assemblers for various processors")
     (description "WLA DX is a set of tools to assemble assembly files to
-- 
2.30.2

bug#55485: [PATCH] gnu: wla-dx: Update to 10.1.

[Ludovic Courtès]

Hi,

Felix Gruber <felgru@posteo.net> skribis:

> * gnu/packages/assembly.scm (wla-dx): Update to 10.1.
> [native-inputs]: Use new style.
> [arguments]: Add custom 'check phase to run run_tests.sh.

Applied, thank you & thanks Maxime!

Ludo’.