[bug#54260] [PATCH 0/3] gnu: ucsim: Update to 0.7.1.

[bug#54260] [PATCH 0/3] gnu: ucsim: Update to 0.7.1.

[Simon South]

Here's a patch series that updates μCsim, a collection of software simulators
for various microcontroller families, to its latest version and fixes a couple
of small outstanding issues with its package definition.

I've tested this on AArch64 and x86-64 and all appears to be well.

--
Simon South
simon@simonsouth.net


Simon South (3):
  gnu: ucsim: Don't run tests when cross-compiling.
  gnu: ucsim: Don't explicitly return #t from phases.
  gnu: ucsim: Update to 0.7.1.

 gnu/packages/embedded.scm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)


base-commit: 97065f9fe3da74adab54b70e28bd2cd59c06ee07
-- 
2.34.0

[bug#54260] [PATCH 1/3] gnu: ucsim: Don't run tests when cross-compiling.

[Simon South]

* gnu/packages/embedded.scm (ucsim)[arguments]: Skip tests when
cross-compiling.
---
 gnu/packages/embedded.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index f7573618b9..43fba510da 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1501,6 +1501,7 @@ (define-public ucsim
                            "--enable-m6809-port"
                            "--enable-p1516-port"
                            "--enable-st7-port")
+       #:tests? ,(not (%current-target-system)) ; run unless cross-compiling
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-makefiles
-- 
2.34.0

[bug#54260] [PATCH 1/3] gnu: ucsim: Don't run tests when cross-compiling.

[Maxime Devos]

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

Simon South schreef op za 05-03-2022 om 07:58 [-0500]:
> +       #:tests? ,(not (%current-target-system)) ; run unless cross-compiling

#:tests? is #false by default when cross-compiling and #true by default
when compiling natively (with some exceptions, e.g. emacs-build-
system).  You probably don't need to set this explicitly.

Greetings,
Maxime.

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

[bug#54260] [PATCH 2/3] gnu: ucsim: Don't explicitly return #t from phases.

[Simon South]

* gnu/packages/embedded.scm (ucsim)[arguments]: Don't explicitly return #t
from phases.
---
 gnu/packages/embedded.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 43fba510da..1d232e471a 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1507,13 +1507,11 @@ (define-public ucsim
          (add-after 'unpack 'patch-makefiles
            (lambda _
              (substitute* (find-files "." "(\\.mk$|\\.in$)")
-               (("/bin/sh") (which "sh")))
-             #t))
+               (("/bin/sh") (which "sh")))))
          (add-after 'install 'remove-empty-directory
            (lambda* (#:key outputs #:allow-other-keys)
              (delete-file-recursively
-              (string-append (assoc-ref outputs "out") "/share/man"))
-             #t)))))
+              (string-append (assoc-ref outputs "out") "/share/man")))))))
     (native-inputs
      (list bison flex))
     (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/")
-- 
2.34.0

[bug#54260] [PATCH 2/3] gnu: ucsim: Don't explicitly return #t from phases.

[Maxime Devos]

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

Simon South schreef op za 05-03-2022 om 07:59 [-0500]:
>           (add-after 'install 'remove-empty-directory
>             (lambda* (#:key outputs #:allow-other-keys)
>               (delete-file-recursively
> -              (string-append (assoc-ref outputs "out") "/share/man"))
> -             #t)))))
> +              (string-append (assoc-ref outputs "out") "/share/man")))))))

Additionally, you could make the #:configure-flags a G-exp and
eliminate input labels (or, in this case, output labels):

(list #:phases
      #~(modify-phases ...
          (add-after ... ...
            (lambda _
              ... (string-append #$output "/share/man") ...))))

Greetings,
Maxime.

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

[bug#54260] [PATCH 2/3] gnu: ucsim: Don't explicitly return #t from phases.

[Simon South]

Maxime Devos <maximedevos@telenet.be> writes:
> Additionally, you could make the #:configure-flags a G-exp and
> eliminate input labels (or, in this case, output labels)

This occurred to me, but is it not better in this case to rely on the
"output" parameter passed into the procedure?  Using "#$output" in this
context feels like a violation of the Law of Demeter, like using a
global variable where a local one would be appropriate.

I'll drop the first patch though; I'd missed seeing the definition of
"gnu-cross-build".

-- 
Simon South
simon@simonsouth.net

[bug#54260] [PATCH 2/3] gnu: ucsim: Don't explicitly return #t from phases.

[Maxime Devos]

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

Simon South schreef op za 05-03-2022 om 11:39 [-0500]:
> This occurred to me, but is it not better in this case to rely on the
> "output" parameter passed into the procedure?  Using "#$output" in this
> context feels like a violation of the Law of Demeter, like using a
> global variable where a local one would be appropriate.

'outputs' is an argument to the phase procedure, but as I understand
it, it is only due to historical reasons (G-exps are relatively new-
ish) and because the procedures in (guix build FOO-build-system) have
no other method for determining the outputs.

Might be a good idea to confirm with chief gexpologist ludo though.

Greetings,
Maxime.

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

[bug#54260] [PATCH 3/3] gnu: ucsim: Update to 0.7.1.

[Simon South]

* gnu/packages/embedded.scm (ucsim): Update to 0.7.1.
[source]: Update URI.
[arguments]<#:configure-flags>: Remove as all stable ports are now built by
default.
<#:phases>: Remove obsolete "remove-empty-directory" phase.
[inputs]: Add ncurses, needed for the serialview utility.
[native-inputs]: Add sdcc when needed for tests.
[description]: Update to mention newly supported microcontroller families.
---
 gnu/packages/embedded.scm | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 1d232e471a..f93968dd59 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -56,6 +56,7 @@ (define-module (gnu packages embedded)
   #:use-module (gnu packages libftdi)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages messaging)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -1486,40 +1487,40 @@ (define-public ebusd
 (define-public ucsim
   (package
     (name "ucsim")
-    (version "0.6-pre68")
+    (version "0.7.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "http://mazsola.iit.uni-miskolc.hu/ucsim/download/unix/"
-                    "devel/ucsim-" version ".tar.gz"))
+                    "source/v" (version-major+minor version) ".x/"
+                    "ucsim-" version ".tar.gz"))
               (sha256
                (base32
-                "1bfj21f5pcfcg1xqqynlcfr8mn6qj5705cgc2lfr2s3n97qsd9df"))))
+                "080471wvkjdzxz5j3zdaq1apjcj84ql50kn26b7p4ansixnimml4"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags '("--enable-avr-port"
-                           "--enable-m6809-port"
-                           "--enable-p1516-port"
-                           "--enable-st7-port")
-       #:tests? ,(not (%current-target-system)) ; run unless cross-compiling
+     `(#:tests? ,(not (%current-target-system)) ; run unless cross-compiling
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-makefiles
            (lambda _
              (substitute* (find-files "." "(\\.mk$|\\.in$)")
-               (("/bin/sh") (which "sh")))))
-         (add-after 'install 'remove-empty-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (delete-file-recursively
-              (string-append (assoc-ref outputs "out") "/share/man")))))))
+               (("/bin/sh") (which "sh"))))))))
+    (inputs
+     (list ncurses))
     (native-inputs
-     (list bison flex))
+     (append (list bison flex)
+             ;; Certain tests use assemblers provided by SDCC.
+             (if (not (%current-target-system))
+                 (list sdcc)
+                 '())))
     (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/")
     (synopsis "Simulators for various microcontroller families")
     (description "μCsim is a collection of software simulators for
-microcontrollers in the Atmel AVR; Intel MCS-51 (8051); Motorola 68HC08 and
-6809; P1516; Padauk PDK13, PDK14 and PDK15; STMicroelectronics ST7 and STM8;
-and Zilog Z80 families, plus many of their variants.")
+microcontrollers in the Atmel AVR; Intel MCS-51 (8051); Motorola 6800, 68HC08
+and 6809; MOS Technology 6502; P1516; Padauk PDK13, PDK14 and PDK15; Philips
+XA; STMicroelectronics ST7 and STM8; Xilinx PicoBlaze; and Zilog Z80 families,
+plus many of their variants.")
     (license license:gpl2+)))
 
 (define-public sdcc
-- 
2.34.0

[bug#54260] [PATCH v2 0/2] gnu: ucsim: Update to 0.7.1.

[Simon South]

Here's a revised version of this patchset that updates μCsim to 0.7.1.

I've responded to Maxime's feedback by dropping the first patch of the
original set, since tests are normally disabled anyway when cross-compiling.

The question of whether "#$output" ought to be used in the first patch of this
set turns out to be academic as the code in question is deleted by the second.

I've tested this again on AArch64 and x86-64 and all appears to be well.

--
Simon South
simon@simonsouth.net


Simon South (2):
  gnu: ucsim: Don't explicitly return #t from phases.
  gnu: ucsim: Update to 0.7.1.

 gnu/packages/embedded.scm | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)


base-commit: 875053310277ccdcb82ff86edf013cd28e6778c8
-- 
2.34.0

[bug#54260] [PATCH v2 1/2] gnu: ucsim: Don't explicitly return #t from phases.

[Simon South]

* gnu/packages/embedded.scm (ucsim)[arguments]: Don't explicitly return #t
from phases.
---
 gnu/packages/embedded.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index f7573618b9..7b219203be 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1506,13 +1506,11 @@ (define-public ucsim
          (add-after 'unpack 'patch-makefiles
            (lambda _
              (substitute* (find-files "." "(\\.mk$|\\.in$)")
-               (("/bin/sh") (which "sh")))
-             #t))
+               (("/bin/sh") (which "sh")))))
          (add-after 'install 'remove-empty-directory
            (lambda* (#:key outputs #:allow-other-keys)
              (delete-file-recursively
-              (string-append (assoc-ref outputs "out") "/share/man"))
-             #t)))))
+              (string-append (assoc-ref outputs "out") "/share/man")))))))
     (native-inputs
      (list bison flex))
     (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/")
-- 
2.34.0

[bug#54260] [PATCH v2 2/2] gnu: ucsim: Update to 0.7.1.

[Simon South]

* gnu/packages/embedded.scm (ucsim): Update to 0.7.1.
[source]: Update URI.
[arguments]<#:configure-flags>: Remove as all stable ports are now built by
default.
<#:phases>: Remove obsolete "remove-empty-directory" phase.
[inputs]: Add ncurses, needed for the serialview utility.
[native-inputs]: Add sdcc when needed for tests.
[description]: Update to mention newly supported microcontroller families.
---
 gnu/packages/embedded.scm | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 7b219203be..e33cfb4be2 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -56,6 +56,7 @@ (define-module (gnu packages embedded)
   #:use-module (gnu packages libftdi)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages messaging)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -1486,39 +1487,39 @@ (define-public ebusd
 (define-public ucsim
   (package
     (name "ucsim")
-    (version "0.6-pre68")
+    (version "0.7.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "http://mazsola.iit.uni-miskolc.hu/ucsim/download/unix/"
-                    "devel/ucsim-" version ".tar.gz"))
+                    "source/v" (version-major+minor version) ".x/"
+                    "ucsim-" version ".tar.gz"))
               (sha256
                (base32
-                "1bfj21f5pcfcg1xqqynlcfr8mn6qj5705cgc2lfr2s3n97qsd9df"))))
+                "080471wvkjdzxz5j3zdaq1apjcj84ql50kn26b7p4ansixnimml4"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags '("--enable-avr-port"
-                           "--enable-m6809-port"
-                           "--enable-p1516-port"
-                           "--enable-st7-port")
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-makefiles
            (lambda _
              (substitute* (find-files "." "(\\.mk$|\\.in$)")
-               (("/bin/sh") (which "sh")))))
-         (add-after 'install 'remove-empty-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (delete-file-recursively
-              (string-append (assoc-ref outputs "out") "/share/man")))))))
+               (("/bin/sh") (which "sh"))))))))
+    (inputs
+     (list ncurses))
     (native-inputs
-     (list bison flex))
+     (append (list bison flex)
+             ;; Certain tests use assemblers provided by SDCC.
+             (if (not (%current-target-system))
+                 (list sdcc)
+                 '())))
     (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/")
     (synopsis "Simulators for various microcontroller families")
     (description "μCsim is a collection of software simulators for
-microcontrollers in the Atmel AVR; Intel MCS-51 (8051); Motorola 68HC08 and
-6809; P1516; Padauk PDK13, PDK14 and PDK15; STMicroelectronics ST7 and STM8;
-and Zilog Z80 families, plus many of their variants.")
+microcontrollers in the Atmel AVR; Intel MCS-51 (8051); Motorola 6800, 68HC08
+and 6809; MOS Technology 6502; P1516; Padauk PDK13, PDK14 and PDK15; Philips
+XA; STMicroelectronics ST7 and STM8; Xilinx PicoBlaze; and Zilog Z80 families,
+plus many of their variants.")
     (license license:gpl2+)))
 
 (define-public sdcc
-- 
2.34.0

[bug#54260] [PATCH v3 0/2] gnu: ucsim: Update to 0.7.1.

[Simon South]

Here's one minor, final revision that modifies the ucsim package's
"description" field to

- Keep the microprocessor families ordered by vendor name; and

- Drop mention of the Philips XA, which is actually an MCS-51 derivative.

Everything else remains the same.

--
Simon South
simon@simonsouth.net


Simon South (2):
  gnu: ucsim: Don't explicitly return #t from phases.
  gnu: ucsim: Update to 0.7.1.

 gnu/packages/embedded.scm | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)


base-commit: 875053310277ccdcb82ff86edf013cd28e6778c8
-- 
2.34.0

[bug#54260] [PATCH v3 1/2] gnu: ucsim: Don't explicitly return #t from phases.

[Simon South]

* gnu/packages/embedded.scm (ucsim)[arguments]: Don't explicitly return #t
from phases.
---
 gnu/packages/embedded.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index f7573618b9..7b219203be 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1506,13 +1506,11 @@ (define-public ucsim
          (add-after 'unpack 'patch-makefiles
            (lambda _
              (substitute* (find-files "." "(\\.mk$|\\.in$)")
-               (("/bin/sh") (which "sh")))
-             #t))
+               (("/bin/sh") (which "sh")))))
          (add-after 'install 'remove-empty-directory
            (lambda* (#:key outputs #:allow-other-keys)
              (delete-file-recursively
-              (string-append (assoc-ref outputs "out") "/share/man"))
-             #t)))))
+              (string-append (assoc-ref outputs "out") "/share/man")))))))
     (native-inputs
      (list bison flex))
     (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/")
-- 
2.34.0

[bug#54260] [PATCH v3 2/2] gnu: ucsim: Update to 0.7.1.

[Simon South]

* gnu/packages/embedded.scm (ucsim): Update to 0.7.1.
[source]: Update URI.
[arguments]<#:configure-flags>: Remove as all stable ports are now built by
default.
<#:phases>: Remove obsolete "remove-empty-directory" phase.
[inputs]: Add ncurses, needed for the serialview utility.
[native-inputs]: Add sdcc when needed for tests.
[description]: Update to mention newly supported microcontroller families.
---
 gnu/packages/embedded.scm | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 7b219203be..f3d5e8fced 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -56,6 +56,7 @@ (define-module (gnu packages embedded)
   #:use-module (gnu packages libftdi)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages messaging)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -1486,39 +1487,39 @@ (define-public ebusd
 (define-public ucsim
   (package
     (name "ucsim")
-    (version "0.6-pre68")
+    (version "0.7.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "http://mazsola.iit.uni-miskolc.hu/ucsim/download/unix/"
-                    "devel/ucsim-" version ".tar.gz"))
+                    "source/v" (version-major+minor version) ".x/"
+                    "ucsim-" version ".tar.gz"))
               (sha256
                (base32
-                "1bfj21f5pcfcg1xqqynlcfr8mn6qj5705cgc2lfr2s3n97qsd9df"))))
+                "080471wvkjdzxz5j3zdaq1apjcj84ql50kn26b7p4ansixnimml4"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags '("--enable-avr-port"
-                           "--enable-m6809-port"
-                           "--enable-p1516-port"
-                           "--enable-st7-port")
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-makefiles
            (lambda _
              (substitute* (find-files "." "(\\.mk$|\\.in$)")
-               (("/bin/sh") (which "sh")))))
-         (add-after 'install 'remove-empty-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (delete-file-recursively
-              (string-append (assoc-ref outputs "out") "/share/man")))))))
+               (("/bin/sh") (which "sh"))))))))
+    (inputs
+     (list ncurses))
     (native-inputs
-     (list bison flex))
+     (append (list bison flex)
+             ;; Certain tests use assemblers provided by SDCC.
+             (if (not (%current-target-system))
+                 (list sdcc)
+                 '())))
     (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/")
     (synopsis "Simulators for various microcontroller families")
     (description "μCsim is a collection of software simulators for
-microcontrollers in the Atmel AVR; Intel MCS-51 (8051); Motorola 68HC08 and
-6809; P1516; Padauk PDK13, PDK14 and PDK15; STMicroelectronics ST7 and STM8;
-and Zilog Z80 families, plus many of their variants.")
+microcontrollers in the Atmel AVR; Intel MCS-51 (8051); MOS Technology 6502;
+Motorola 6800, 68HC08 and 6809; P1516; Padauk PDK13, PDK14 and PDK15;
+STMicroelectronics ST7 and STM8; Xilinx PicoBlaze; and Zilog Z80 families,
+plus many of their variants.")
     (license license:gpl2+)))
 
 (define-public sdcc
-- 
2.34.0

bug#54260: [PATCH 0/3] gnu: ucsim: Update to 0.7.1.

[Ludovic Courtès]

Hi,

Simon South <simon@simonsouth.net> skribis:

>   gnu: ucsim: Don't explicitly return #t from phases.
>   gnu: ucsim: Update to 0.7.1.

Applied.  Thank you, and thanks Maxime for reviewing!

Ludo’.