* [bug#59681] [PATCH 1/2] gnu: loko: Use G-expressions.
@ 2022-11-29 15:21 Zhu Zihao
2022-11-29 15:21 ` [bug#59682] [PATCH 2/2] gnu: loko-scheme: Update to 0.12.0 Zhu Zihao
[not found] ` <handler.59681.B.166973532513778.ack@debbugs.gnu.org>
0 siblings, 2 replies; 5+ messages in thread
From: Zhu Zihao @ 2022-11-29 15:21 UTC (permalink / raw)
To: 59681; +Cc: Zhu Zihao
* 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#59682] [PATCH 2/2] gnu: loko-scheme: Update to 0.12.0.
2022-11-29 15:21 [bug#59681] [PATCH 1/2] gnu: loko: Use G-expressions Zhu Zihao
@ 2022-11-29 15:21 ` Zhu Zihao
[not found] ` <handler.59682.B.166973533513791.ack@debbugs.gnu.org>
[not found] ` <handler.59681.B.166973532513778.ack@debbugs.gnu.org>
1 sibling, 1 reply; 5+ messages in thread
From: Zhu Zihao @ 2022-11-29 15:21 UTC (permalink / raw)
To: 59682; +Cc: Zhu Zihao
* 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#59682] Acknowledgement ([PATCH 2/2] gnu: loko-scheme: Update to 0.12.0.)
[not found] ` <handler.59682.B.166973533513791.ack@debbugs.gnu.org>
@ 2022-11-29 15:29 ` Zhu Zihao
0 siblings, 0 replies; 5+ messages in thread
From: Zhu Zihao @ 2022-11-29 15:29 UTC (permalink / raw)
To: 59682
[-- Attachment #1: Type: text/plain, Size: 148 bytes --]
Can someone help merge this to 59681?
--
Retrieve my PGP public key:
gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC
Zihao
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#59681] Acknowledgement ([PATCH 1/2] gnu: loko: Use G-expressions.)
[not found] ` <handler.59681.B.166973532513778.ack@debbugs.gnu.org>
@ 2022-11-29 15:30 ` Zhu Zihao
2022-12-02 22:08 ` bug#59681: [PATCH 1/2] gnu: loko: Use G-expressions Ludovic Courtès
0 siblings, 1 reply; 5+ messages in thread
From: Zhu Zihao @ 2022-11-29 15:30 UTC (permalink / raw)
To: 59681
[-- Attachment #1.1: Type: text/plain, Size: 54 bytes --]
Something wrong with the original patch, update here
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-loko-scheme-Use-G-expressions.patch --]
[-- Type: text/x-patch, Size: 4017 bytes --]
From 0d85f05069ccb1bfa648def38375b981893e3601 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-loko-scheme-Update-to-0.12.0.patch --]
[-- Type: text/x-patch, Size: 1862 bytes --]
From 907766669a0efdb16631361ee3f225da8a6767f1 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@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
[-- Attachment #4: Type: text/plain, Size: 100 bytes --]
--
Retrieve my PGP public key:
gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC
Zihao
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#59681: [PATCH 1/2] gnu: loko: Use G-expressions.
2022-11-29 15:30 ` [bug#59681] Acknowledgement ([PATCH 1/2] gnu: loko: Use G-expressions.) Zhu Zihao
@ 2022-12-02 22:08 ` Ludovic Courtès
0 siblings, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2022-12-02 22:08 UTC (permalink / raw)
To: Zhu Zihao; +Cc: 59681-done
Hi,
Zhu Zihao <all_but_last@163.com> skribis:
>>From 0d85f05069ccb1bfa648def38375b981893e3601 Mon Sep 17 00:00:00 2001
> From: Zhu Zihao <all_but_last@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@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’.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-12-02 22:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-29 15:21 [bug#59681] [PATCH 1/2] gnu: loko: Use G-expressions Zhu Zihao
2022-11-29 15:21 ` [bug#59682] [PATCH 2/2] gnu: loko-scheme: Update to 0.12.0 Zhu Zihao
[not found] ` <handler.59682.B.166973533513791.ack@debbugs.gnu.org>
2022-11-29 15:29 ` [bug#59682] Acknowledgement ([PATCH 2/2] gnu: loko-scheme: Update to 0.12.0.) Zhu Zihao
[not found] ` <handler.59681.B.166973532513778.ack@debbugs.gnu.org>
2022-11-29 15:30 ` [bug#59681] Acknowledgement ([PATCH 1/2] gnu: loko: Use G-expressions.) Zhu Zihao
2022-12-02 22:08 ` bug#59681: [PATCH 1/2] gnu: loko: Use G-expressions Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).