02/21: gnu: dejagnu: Use G-expressions.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 7bbab14b403d2248fe08d8a5a7d116f479715b2e
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Jun 30 18:56:03 2022 +0200

    gnu: dejagnu: Use G-expressions.
    
    * gnu/packages/dejagnu.scm (dejagnu)[arguments]: Use gexp and remove label 
usage.
---
 gnu/packages/dejagnu.scm | 96 ++++++++++++++++++++++++------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/gnu/packages/dejagnu.scm b/gnu/packages/dejagnu.scm
index 59f8bd41c2..f3445b3d87 100644
--- a/gnu/packages/dejagnu.scm
+++ b/gnu/packages/dejagnu.scm
@@ -22,6 +22,7 @@
 (define-module (gnu packages dejagnu)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix build-system gnu)
   #:use-module (guix licenses)
   #:use-module (gnu packages bash)
@@ -33,58 +34,57 @@
     (version "1.6.3")
     (source
      (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/dejagnu/dejagnu-"
-                          version ".tar.gz"))
-      (sha256
-       (base32
-        "1qx2cv6qkxbiqg87jh217jb62hk3s7dmcs4cz1llm2wmsynfznl7"))))
+       (method url-fetch)
+       (uri (string-append "mirror://gnu/dejagnu/dejagnu-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1qx2cv6qkxbiqg87jh217jb62hk3s7dmcs4cz1llm2wmsynfznl7"))))
     (build-system gnu-build-system)
     (inputs (list bash-minimal expect))
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-/bin/sh
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; Patch embedded /bin/sh references.
-             (let ((/bin/sh (search-input-file inputs "/bin/sh")))
-               (substitute* "dejagnu"
-                 (("exec /bin/sh")
-                  (string-append "exec " /bin/sh)))
-               (substitute* (find-files "testsuite/report-card.all")
-               (("/bin/sh") /bin/sh)))))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             ;; Note: The test-suite *requires* /dev/pts among the
-             ;; `build-chroot-dirs' of the build daemon when
-             ;; building in a chroot.  See
-             ;; <http://thread.gmane.org/gmane.linux.distributions.nixos/1036>
-             ;; for details.
-             (when tests?
-               (if (and (directory-exists? "/dev/pts")
-                        (directory-exists? "/proc"))
-                 (begin
-                   ;; Provide `runtest' with a log name, otherwise it
-                   ;; tries to run `whoami', which fails when in a chroot.
-                   (setenv "LOGNAME" "guix-builder")
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-/bin/sh
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; Patch embedded /bin/sh references.
+              (let ((/bin/sh (search-input-file inputs "/bin/sh")))
+                (substitute* "dejagnu"
+                  (("exec /bin/sh")
+                   (string-append "exec " /bin/sh)))
+                (substitute* (find-files "testsuite/report-card.all")
+                  (("/bin/sh") /bin/sh)))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              ;; Note: The test-suite *requires* /dev/pts among the
+              ;; `build-chroot-dirs' of the build daemon when
+              ;; building in a chroot.  See
+              ;; <http://thread.gmane.org/gmane.linux.distributions.nixos/1036>
+              ;; for details.
+              (when tests?
+                (if (and (directory-exists? "/dev/pts")
+                         (directory-exists? "/proc"))
+                    (begin
+                      ;; Provide `runtest' with a log name, otherwise it
+                      ;; tries to run `whoami', which fails when in a chroot.
+                      (setenv "LOGNAME" "guix-builder")
 
-                   ;; The test-suite needs to have a non-empty stdin:
-                   ;; 
<http://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html>.
-                   (unless (zero? (system "make check < /dev/zero"))
-                     (error "make check failed")))
-                 (display "test suite cannot be run, skipping\n")))))
-         (add-after 'install 'post-install
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             ;; Use the right `expect' binary.
-             (let ((out    (assoc-ref outputs "out"))
-                   (expect (assoc-ref inputs "expect")))
-               (substitute* (string-append out "/bin/runtest")
-                 (("^mypath.*$" all)
-                  (string-append all
-                                 "export PATH="
-                                 expect "/bin:$PATH\n")))))))))
-    (home-page
-     "https://www.gnu.org/software/dejagnu/";)
+                      ;; The test-suite needs to have a non-empty stdin:
+                      ;; 
<http://lists.gnu.org/archive/html/bug-dejagnu/2003-06/msg00002.html>.
+                      (unless (zero? (system "make check < /dev/zero"))
+                        (error "make check failed")))
+                    (display "test suite cannot be run, skipping\n")))))
+          (add-after 'install 'post-install
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              ;; Use the right `expect' binary.
+              (let ((expect (search-input-file inputs "/bin/expect")))
+                (substitute* (string-append #$output "/bin/runtest")
+                  (("^mypath.*$" all)
+                   (string-append all
+                                  "export PATH="
+                                  (dirname expect) ":$PATH\n")))))))))
+    (home-page "https://www.gnu.org/software/dejagnu/";)
     (synopsis "GNU software testing framework")
     (description
      "DejaGnu is a framework for testing software.  In effect, it serves as