GNU bug report logs -
#59681
[PATCH 1/2] gnu: loko: Use G-expressions.
Previous Next
Reported by: Zhu Zihao <all_but_last <at> 163.com>
Date: Tue, 29 Nov 2022 15:23:02 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 59681 in the body.
You can then email your comments to 59681 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#59681; Package
guix-patches.
(Tue, 29 Nov 2022 15:23:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Zhu Zihao <all_but_last <at> 163.com>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Tue, 29 Nov 2022 15:23:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* 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
Information forwarded
to
guix-patches <at> gnu.org:
bug#59681; Package
guix-patches.
(Tue, 29 Nov 2022 15:35:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 59681 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Something wrong with the original patch, update here
[signature.asc (application/pgp-signature, inline)]
[0001-gnu-loko-scheme-Use-G-expressions.patch (text/x-patch, inline)]
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.
---
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
[0002-gnu-loko-scheme-Update-to-0.12.0.patch (text/x-patch, inline)]
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.
---
gnu/packages/loko.scm | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/loko.scm b/gnu/packages/loko.scm
index cb189acb87..49dcc92d1e 100644
--- a/gnu/packages/loko.scm
+++ b/gnu/packages/loko.scm
@@ -18,6 +18,7 @@
(define-module (gnu packages loko)
#:use-module (guix packages)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:prefix license:)
@@ -29,7 +30,7 @@ (define-module (gnu packages loko)
(define-public loko-scheme
(package
(name "loko-scheme")
- (version "0.7.0")
+ (version "0.12.0")
(source
(origin
(method git-fetch)
@@ -37,7 +38,7 @@ (define-public loko-scheme
(url "https://gitlab.com/weinholt/loko")
(commit (string-append "v" version))))
(sha256
- (base32 "1441aarw3vy14zdxyab495ag2fch04v4j89krhbqnqfkz6mdi0vy"))
+ (base32 "12xp82z91qkp9q8lfp46s4sda8qgs472jic3js1kbykn4jzy7399"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
@@ -46,9 +47,7 @@ (define-public loko-scheme
#:tests? #f
#:strip-binaries? #f
#:make-flags
- #~(list
- (string-append "PREFIX=" #$output)
- (string-append "GDB_AUTOLOAD_PATH=" #$output "/share/gdb/auto-load"))
+ #~(list (string-append "PREFIX=" #$output))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
--
2.38.1
[Message part 5 (text/plain, inline)]
--
Retrieve my PGP public key:
gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC
Zihao
Reply sent
to
Ludovic Courtès <ludo <at> gnu.org>:
You have taken responsibility.
(Fri, 02 Dec 2022 22:42:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Zhu Zihao <all_but_last <at> 163.com>:
bug acknowledged by developer.
(Fri, 02 Dec 2022 22:42:02 GMT)
Full text and
rfc822 format available.
Message #13 received at 59681-done <at> debbugs.gnu.org (full text, mbox):
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’.
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Sat, 31 Dec 2022 12:24:09 GMT)
Full text and
rfc822 format available.
This bug report was last modified 2 years and 229 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.