From patchwork Tue Nov 29 15:21:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 44958 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6E87427BBEC; Tue, 29 Nov 2022 15:23:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8B7F227BBE9 for ; Tue, 29 Nov 2022 15:23:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p02Ru-0004IQ-Bm; Tue, 29 Nov 2022 10:23:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p02Rs-0004I5-27 for guix-patches@gnu.org; Tue, 29 Nov 2022 10:23:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p02Rq-00008H-NM for guix-patches@gnu.org; Tue, 29 Nov 2022 10:23:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p02Rq-0003aw-9l for guix-patches@gnu.org; Tue, 29 Nov 2022 10:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59681] [PATCH 1/2] gnu: loko: Use G-expressions. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Nov 2022 15:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59681 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59681@debbugs.gnu.org Cc: Zhu Zihao X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166973532513778 (code B ref -1); Tue, 29 Nov 2022 15:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Nov 2022 15:22:05 +0000 Received: from localhost ([127.0.0.1]:54720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p02Qv-0003aA-9A for submit@debbugs.gnu.org; Tue, 29 Nov 2022 10:22:05 -0500 Received: from lists.gnu.org ([209.51.188.17]:59030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p02Qr-0003Zn-MZ for submit@debbugs.gnu.org; Tue, 29 Nov 2022 10:22:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p02Qq-0004CG-JP for guix-patches@gnu.org; Tue, 29 Nov 2022 10:22:01 -0500 Received: from mail-m974.mail.163.com ([123.126.97.4]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p02Qm-0008TA-BE for guix-patches@gnu.org; Tue, 29 Nov 2022 10:22:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=V6FUi GOoD9YlSChmTx75UzKW8SjOIekfgQVUzDuhJpc=; b=nUp/b5GmrEa2Sd4yjpct8 QFeG7j5/muYzztx+C6Lyz0Pq8V5RgkatCMQzI4oaKBv2B/ZQWTdJn2tN667WDDf1 oE/TEJrCMnwi4pFXEjj/ZGvQHUXeHPnxcIc55J9nZnSOt09JiJmMHvFzpccCtKwX NnPZM+D9tEpz3ohPKqr6Xw= Received: from localhost.localdomain (unknown [163.125.249.242]) by smtp4 (Coremail) with SMTP id HNxpCgDXF3iCI4ZjVIBntw--.59865S2; Tue, 29 Nov 2022 23:21:43 +0800 (CST) From: Zhu Zihao Date: Tue, 29 Nov 2022 23:21:33 +0800 Message-Id: <20221129152134.8917-1-all_but_last@163.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-CM-TRANSID: HNxpCgDXF3iCI4ZjVIBntw--.59865S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxCF45GF4DAF1xAry7ZFyDGFg_yoW5Zr4fpa 4Sk3Z3Kr4rCryrAan3Xw48ur15WF4ktF45Cws3Cw40yws0vFy0gr17KrZ5ZFyxt34xZ347 GwsrXrW5WrWUuFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JUv9akUUUUU= X-Originating-IP: [163.125.249.242] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBoQjIr2I0V8eYqgAAs6 Received-SPF: pass client-ip=123.126.97.4; envelope-from=all_but_last@163.com; helo=mail-m974.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Tue Nov 29 15:21:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 44957 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E05E127BBEC; Tue, 29 Nov 2022 15:23:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 66BF727BBE9 for ; Tue, 29 Nov 2022 15:23:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p02Rw-0004Ij-Oo; Tue, 29 Nov 2022 10:23:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p02Rs-0004I6-2R for guix-patches@gnu.org; Tue, 29 Nov 2022 10:23:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p02Rr-00008I-6G for guix-patches@gnu.org; Tue, 29 Nov 2022 10:23:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p02Rr-0003bA-1Q for guix-patches@gnu.org; Tue, 29 Nov 2022 10:23:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59682] [PATCH 2/2] gnu: loko-scheme: Update to 0.12.0. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Nov 2022 15:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59682 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59682@debbugs.gnu.org Cc: Zhu Zihao X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166973533513791 (code B ref -1); Tue, 29 Nov 2022 15:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Nov 2022 15:22:15 +0000 Received: from localhost ([127.0.0.1]:54723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p02R4-0003aN-Mq for submit@debbugs.gnu.org; Tue, 29 Nov 2022 10:22:15 -0500 Received: from lists.gnu.org ([209.51.188.17]:40816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p02R3-0003aH-NK for submit@debbugs.gnu.org; Tue, 29 Nov 2022 10:22:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p02R3-0004D6-JF for guix-patches@gnu.org; Tue, 29 Nov 2022 10:22:13 -0500 Received: from mail-m974.mail.163.com ([123.126.97.4]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p02R1-0008TB-Hu for guix-patches@gnu.org; Tue, 29 Nov 2022 10:22:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=+KZLl 51xiV77gZwz0reoWkkfykblAGqqYZcPajL8mjA=; b=Na7QqELUiLiEHhcY+4ur4 JbXVI2Zq4Lxa11iJyYvmFnbPxlgTzerUXoZryYeSQikq+0fePp9NDJ1lcYJhXU0h xZ5jpgrjTMhFtzr1tfiOwtoN40C2a04nQXyJAFx/NgoPXXlWyHEwvU9kOALSpjFI ORqIyOStJ6ABaiF/b2kVk0= Received: from localhost.localdomain (unknown [163.125.249.242]) by smtp4 (Coremail) with SMTP id HNxpCgDXF3iCI4ZjVIBntw--.59865S3; Tue, 29 Nov 2022 23:21:47 +0800 (CST) From: Zhu Zihao Date: Tue, 29 Nov 2022 23:21:34 +0800 Message-Id: <20221129152134.8917-2-all_but_last@163.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221129152134.8917-1-all_but_last@163.com> References: <20221129152134.8917-1-all_but_last@163.com> MIME-Version: 1.0 X-CM-TRANSID: HNxpCgDXF3iCI4ZjVIBntw--.59865S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw13ur4UAFy8tryktrW7XFb_yoW8Wr47pF 1Sv34F9rn5Kry5Xan7WF42gw13XrZ2yFWUC397Zw1xKws0grWvvFyxKan0kF17G3WxZw47 uayxZ3W3JryUurJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JUyCJkUUUUU= X-Originating-IP: [163.125.249.242] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBawvIr1et63s32QAAsD Received-SPF: pass client-ip=123.126.97.4; envelope-from=all_but_last@163.com; helo=mail-m974.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)