GNU bug report logs - #59681
[PATCH 1/2] gnu: loko: Use G-expressions.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#59681: closed ([PATCH 1/2] gnu: loko: Use G-expressions.)
Date: Fri, 02 Dec 2022 22:42:02 +0000

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

Your message dated Fri, 02 Dec 2022 23:08:21 +0100
with message-id <87ilitpiga.fsf_-_ <at> gnu.org>
and subject line Re: bug#59681: [PATCH 1/2] gnu: loko: Use G-expressions.
has caused the debbugs.gnu.org bug report #59681,
regarding [PATCH 1/2] gnu: loko: Use G-expressions.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
59681: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59681
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Zhu Zihao <all_but_last <at> 163.com>
To: guix-patches <at> gnu.org
Cc: Zhu Zihao <all_but_last <at> 163.com>
Subject: [PATCH 1/2] gnu: loko: Use G-expressions.
Date: Tue, 29 Nov 2022 23:21:33 +0800

* gnu/packages/loko.scm (loko)[arguments]: Use G-expressions.
<#:phases>: In 'akku-fixes', replace "(assoc-ref inputs name)" with
"this-package-native-input".
[native-inputs]: Use label-less style.
---
 gnu/packages/loko.scm | 72 +++++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/loko.scm b/gnu/packages/loko.scm
index 449c62f1f0..cb189acb87 100644
--- a/gnu/packages/loko.scm
+++ b/gnu/packages/loko.scm
@@ -41,41 +41,45 @@ (define-public loko-scheme
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
-     `(;; r7rs tests are a work in progress as of 0.7.0.
-       #:tests? #f
-       #:strip-binaries? #f
-       #:make-flags
-       (let ((out (assoc-ref %outputs "out")))
-         (list
-          (string-append "PREFIX=" out)
-          (string-append "GDB_AUTOLOAD_PATH=" out "/share/gdb/auto-load")))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (add-before 'build 'akku-fixes
-           (lambda* (#:key inputs #:allow-other-keys)
-             (delete-file "Akku.lock")
-             (substitute* "Akku.manifest"
-               (("\\(depends.*") "(depends)"))
-             (invoke "akku" "install")
-             (let ((dest "./.akku/lib/")
-                   (source "/share/guile/site/3.0/"))
-               (for-each
-                (lambda (name)
-                  ;; Symlink the scheme libraries so that Akku can find them
-                  (symlink (string-append (assoc-ref inputs name) source name)
-                           (string-append dest name)))
-                '("struct" "laesare" "pfds" "machine-code")))
-             (substitute* ".akku/env"
-               (("/bin/sh") (which "sh")))
-             #t)))))
+     (list
+      ;; r7rs tests are a work in progress as of 0.7.0.
+      #:tests? #f
+      #:strip-binaries? #f
+      #:make-flags
+      #~(list
+         (string-append "PREFIX=" #$output)
+         (string-append "GDB_AUTOLOAD_PATH=" #$output "/share/gdb/auto-load"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)
+          (add-before 'build 'akku-fixes
+            (lambda _
+              (delete-file "Akku.lock")
+              (substitute* "Akku.manifest"
+                (("\\(depends.*") "(depends)"))
+              (invoke "akku" "install")
+              (let ((dest "./.akku/lib/")
+                    (source "/share/guile/site/3.0/"))
+                (for-each
+                 (lambda (name prefix)
+                   ;; Symlink the scheme libraries so that Akku can find them
+                   (symlink (string-append prefix source name)
+                            (string-append dest name)))
+                 '("struct" "laesare" "pfds" "machine-code")
+                 (list #$(this-package-native-input "guile-struct-pack")
+                       #$(this-package-native-input "guile-laesare")
+                       #$(this-package-native-input "guile-pfds")
+                       #$(this-package-native-input "guile-machine-code"))))
+              (substitute* ".akku/env"
+                (("/bin/sh") (which "sh")))
+              #t)))))
     (native-inputs
-     `(("akku" ,akku)
-       ("chez-scheme" ,(chez-scheme-for-system))
-       ("struct" ,guile-struct-pack)
-       ("laesare" ,guile-laesare)
-       ("pfds" ,guile-pfds)
-       ("machine-code" ,guile-machine-code)))
+     (list akku
+           (chez-scheme-for-system)
+           guile-struct-pack
+           guile-laesare
+           guile-pfds
+           guile-machine-code))
     (home-page "https://scheme.fail")
     (synopsis "Implementation of the algorithmic language Scheme")
     (description
-- 
2.38.1

[Message part 3 (message/rfc822, inline)]

From: Ludovic Courtès <ludo <at> gnu.org>
To: Zhu Zihao <all_but_last <at> 163.com>
Cc: 59681-done <at> debbugs.gnu.org
Subject: Re: bug#59681: [PATCH 1/2] gnu: loko: Use G-expressions.
Date: Fri, 02 Dec 2022 23:08:21 +0100

Hi,

Zhu Zihao <all_but_last <at> 163.com> skribis:

>>From 0d85f05069ccb1bfa648def38375b981893e3601 Mon Sep 17 00:00:00 2001
> From: Zhu Zihao <all_but_last <at> 163.com>
> Date: Tue, 29 Nov 2022 18:59:24 +0800
> Subject: [PATCH 1/2] gnu: loko-scheme: Use G-expressions.
>
> * gnu/packages/loko.scm (loko-scheme)[arguments]: Use G-expressions.
> <#:phases>: In 'akku-fixes', replace "(assoc-ref inputs name)" with
> "this-package-native-input".
> [native-inputs]: Use label-less style.

[...]

>>From 907766669a0efdb16631361ee3f225da8a6767f1 Mon Sep 17 00:00:00 2001
> From: Zhu Zihao <all_but_last <at> 163.com>
> Date: Tue, 29 Nov 2022 19:27:05 +0800
> Subject: [PATCH 2/2] gnu: loko-scheme: Update to 0.12.0.
>
> * gnu/packages/loko.scm (loko-scheme): Update to 0.12.0.
> [arguments]<#:make-flags>: No need to specify GDB scripts directory.

Applied, thanks!

Ludo’.

Previous Next

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