From patchwork Fri Apr 29 11:56:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 39032 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 4592727BBE9; Fri, 29 Apr 2022 12:58:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 D9B3527BBEA for ; Fri, 29 Apr 2022 12:58:57 +0100 (BST) Received: from localhost ([::1]:33380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nkPGz-00070Q-2W for patchwork@mira.cbaines.net; Fri, 29 Apr 2022 07:58:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkPG8-0006zm-JP for guix-patches@gnu.org; Fri, 29 Apr 2022 07:58:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57141) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nkPG5-0004OC-W5 for guix-patches@gnu.org; Fri, 29 Apr 2022 07:58:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nkPG5-0000n6-Vr for guix-patches@gnu.org; Fri, 29 Apr 2022 07:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55182] [PATCH 3/3] gnu: apl: Use G-expressions. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Apr 2022 11:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55182@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 55182-submit@debbugs.gnu.org id=B55182.16512334312959 (code B ref 55182); Fri, 29 Apr 2022 11:58:01 +0000 Received: (at 55182) by debbugs.gnu.org; 29 Apr 2022 11:57:11 +0000 Received: from localhost ([127.0.0.1]:51037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkPFH-0000lf-Hm for submit@debbugs.gnu.org; Fri, 29 Apr 2022 07:57:11 -0400 Received: from mail-4022.proton.ch ([185.70.40.22]:57290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkPFG-0000lQ-4c for 55182@debbugs.gnu.org; Fri, 29 Apr 2022 07:57:10 -0400 Date: Fri, 29 Apr 2022 11:56:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1651233424; bh=h1Vjbe/iSUMdl9O4PhZhrkuz0N+pKzbQ+sxBhqrqppg=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=Ox2oE95B1QBnTXy9l0GtPxgfyShCzRQKRviPFmFSyBM2p76gjpLlSCFbbPso+LTZM xCVfsOjDcDvppVPy2tYDmRdUY1B1FUHWzipnrbqpAIX1LLALuOrCsl5YFBT9Uo5rIo BLM+lyFjWQk/Yk7Kc95ClWb8bOUzthXQIeCqnulXZi7P10Q4kAboQZiqMWtiSnzVpK EtCng7uUcewgVIFOpNRp3f8DY76ZS8dAKS7R/my5E6dMl7oefBH/R8TBVmB8VMkPj8 knbiSoT8Cp0wEJ4vcJjba1HVP9MeN/7gH7nFJzlFDjbB0Wl0vlICiMaZsIF4ZT5FjT 6b4oqiKocU1Fg== From: "Paul A. Patience" Message-ID: <20220429115646.539143-2-paul@apatience.com> In-Reply-To: <20220429115646.539143-1-paul@apatience.com> References: <20220429115646.539143-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/apl.scm (apl)[arguments]: Use G-expressions. --- gnu/packages/apl.scm | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) -- 2.36.0 diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm index 9c4b9a48e1..86a5adc90e 100644 --- a/gnu/packages/apl.scm +++ b/gnu/packages/apl.scm @@ -23,6 +23,7 @@ (define-module (gnu packages apl) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix git-download) #:use-module (guix svn-download) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (gnu packages gettext) @@ -54,24 +55,24 @@ (define-public apl readline sqlite)) (arguments - `(#:configure-flags (list (string-append - "--with-sqlite3=" - (assoc-ref %build-inputs "sqlite"))) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-configure - (lambda _ - (substitute* "buildtag.sh" - ;; Don't exit on failed SVN-related calls. - (("^ +return 0\n") "") - ;; Manually set the SVN revision, since the directory is - ;; unversioned and we know it anyway. - (("^SVNINFO=.*") - ,(string-append "SVNINFO=" (number->string revision) "\n")) - ;; Requires running ‘svn info’ on a versioned directory. - (("\\\\\"\\$ARCHIVE_SVNINFO\\\\\"") "\\\"\\\"") - ;; Don't leak build information. - (("\\\\\"\\$abs_srcdir\\\\\"") "\\\"\\\""))))))) + (list #:configure-flags #~(list (string-append + "--with-sqlite3=" + #$(this-package-input "sqlite"))) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'fix-configure + (lambda _ + (substitute* "buildtag.sh" + ;; Don't exit on failed SVN-related calls. + (("^ +return 0\n") "") + ;; Manually set the SVN revision, since the directory is + ;; unversioned and we know it anyway. + (("^SVNINFO=.*") + (string-append "SVNINFO=" #$(number->string revision) "\n")) + ;; Requires running ‘svn info’ on a versioned directory. + (("\\\\\"\\$ARCHIVE_SVNINFO\\\\\"") "\\\"\\\"") + ;; Don't leak build information. + (("\\\\\"\\$abs_srcdir\\\\\"") "\\\"\\\""))))))) (synopsis "APL interpreter") (description "GNU APL is a free interpreter for the programming language APL. It is