From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id SBXwIMYmhmPVfAAAbAwnHQ (envelope-from ) for ; Tue, 29 Nov 2022 16:35:34 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id mKApIMYmhmOTrAAAG6o9tA (envelope-from ) for ; Tue, 29 Nov 2022 16:35:34 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 75B9625757 for ; Tue, 29 Nov 2022 16:35:28 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p02dW-0000VR-8V; Tue, 29 Nov 2022 10:35: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 1p02dT-0000Ux-9I for guix-patches@gnu.org; Tue, 29 Nov 2022 10:35:03 -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 1p02dS-00028y-Gi for guix-patches@gnu.org; Tue, 29 Nov 2022 10:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p02dS-0003lT-Cf for guix-patches@gnu.org; Tue, 29 Nov 2022 10:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59681] Acknowledgement ([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:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59681 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59681@debbugs.gnu.org Received: via spool by 59681-submit@debbugs.gnu.org id=B59681.166973607014456 (code B ref 59681); Tue, 29 Nov 2022 15:35:02 +0000 Received: (at 59681) by debbugs.gnu.org; 29 Nov 2022 15:34:30 +0000 Received: from localhost ([127.0.0.1]:54788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p02cv-0003l6-HV for submit@debbugs.gnu.org; Tue, 29 Nov 2022 10:34:30 -0500 Received: from m12.mail.163.com ([220.181.12.217]:60070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p02ct-0003l0-7W for 59681@debbugs.gnu.org; Tue, 29 Nov 2022 10:34:28 -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=1YGua xnnd8XszKUBZD0QDFPMNYMno/huKX7ialaTF2c=; b=dORGtOvOzGKR8lKDpmkCi VjInQSGBvSiX6HvLhpEQUy9mZ7uQfrehM6sVKacYti0Pa3CPODutyGJmldAVEOf8 KOFIj4sMZl0NN8PcAx7dd48+rWpm2TW/G1zxNVmEP+kZTACUJtDnwUkHcjZ9GtRI TRzqrm56h741iVl+uioZxA= Received: from asus-laptop (unknown [163.125.249.242]) by zwqz-smtp-mta-g0-1 (Coremail) with SMTP id _____wD3_+93JoZjP3+CAA--.47504S2; Tue, 29 Nov 2022 23:34:15 +0800 (CST) References: <20221129152134.8917-1-all_but_last@163.com> User-agent: mu4e 1.8.11; emacs 30.0.50 From: Zhu Zihao Date: Tue, 29 Nov 2022 23:30:37 +0800 In-reply-to: Message-ID: <86edtlrczz.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: _____wD3_+93JoZjP3+CAA--.47504S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTRyE_tDUUUU X-Originating-IP: [163.125.249.242] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFB7Ir1aEA9dCjwAAsm 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1669736128; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=1YGuaxnnd8XszKUBZD0QDFPMNYMno/huKX7ialaTF2c=; b=aAVN3VIGTguOTm3lOsuN0SGs9ZND4PjStQlkVbGhK071/FHkW2g6kmaBykri/J2L0F924U Hg70Qdh4aqCc/M/m8mHRrzkRUCUAmVokcEav5bW2BUTYLiAozoLA6kDz4brW9WOlqiwlPB /3b/bqMQwqyraAkKY4dSMYk8ImNyjuJvTaEHorV6dQwCmQ6iFYtYyUdZLo2DArBQCWPkG9 svuc0XVYg/FoYsMVYWQ/Sq9HGCmHhOMVNZ5rOXD1i5PuROBuu1SouoLDogQX3q8Wp0MBJo fkpfOQ/kOa11p4hVsCxEWfDig5Puv84jWYhvQgSJVkZEtRyPUwwcq6V5uJYQJg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1669736128; a=rsa-sha256; cv=none; b=BPGZARnQKYLU4N5wYynonGqPA+avdLxFuU9To6XiqdeBE/wyp2Swf/trjJeee9z5RuYapX ZsonYiDT8DcGjjGVXED8LdezZqKtGoBXLXMTdpr2N6+jOn9NYaL+vPDxe0wi1heLM4mfrv wy1SmsbOXgM/LkbwrOZMd14PadGqHPUDolZqr4La1Fydr3OFQWUt71HrXgtQfon8xajeI1 7YMr3/l0M2wYGokulKRGpZSkN6eLFdxfy1sWB3X/sOZRPYfwhGtBnEXg2KREUuZGKEA+xS 2/HjB70hsD+IPfZdldGdSa8QcnUchZrkVS/xJ8zD7TEZakEDOu9f8d5IyRpcCQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=dORGtOvO; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 8.24 X-Spam: Yes Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=dORGtOvO; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 75B9625757 X-Spam-Score: 8.24 X-Migadu-Spam: Yes X-Migadu-Scanner: scn0.migadu.com X-TUID: HDPQLHPs6hBL --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Something wrong with the original patch, update here --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQT4UAIrVkIEZilSHr2K2nJqP6LM8gUCY4YmcBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQitpyaj+izPL7ggEAp7WnyLAsRHdq6ZtPPbaY+3hJKDXi ey+55N92JpJ/5cMA/3Uef03v/cu1XBw2nCwYJfsxs+RwhjXDzHCi7m0xzIgI =NJZy -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-loko-scheme-Use-G-expressions.patch >From 0d85f05069ccb1bfa648def38375b981893e3601 Mon Sep 17 00:00:00 2001 From: Zhu Zihao 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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-loko-scheme-Update-to-0.12.0.patch >From 907766669a0efdb16631361ee3f225da8a6767f1 Mon Sep 17 00:00:00 2001 From: Zhu Zihao 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 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC Zihao --=-=-=--