From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ACL6BtbAb2I43QAAbAwnHQ (envelope-from ) for ; Mon, 02 May 2022 13:30:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id cLflBtbAb2KQJwEAauVa8A (envelope-from ) for ; Mon, 02 May 2022 13:30:30 +0200 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 B36B74561F for ; Mon, 2 May 2022 13:30:29 +0200 (CEST) Received: from localhost ([::1]:43176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlUG4-00015W-TJ for larch@yhetil.org; Mon, 02 May 2022 07:30:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlU44-0000Hh-6x for guix-patches@gnu.org; Mon, 02 May 2022 07:18:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlU43-0005QD-Tm for guix-patches@gnu.org; Mon, 02 May 2022 07:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlU43-0005f6-QO for guix-patches@gnu.org; Mon, 02 May 2022 07:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55182] [PATCH v2 3/3] gnu: apl: Use G-expressions. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 11:18:03 +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.165149025921692 (code B ref 55182); Mon, 02 May 2022 11:18:03 +0000 Received: (at 55182) by debbugs.gnu.org; 2 May 2022 11:17:39 +0000 Received: from localhost ([127.0.0.1]:35000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlU3f-0005do-73 for submit@debbugs.gnu.org; Mon, 02 May 2022 07:17:39 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:19488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlU3e-0005bb-23 for 55182@debbugs.gnu.org; Mon, 02 May 2022 07:17:38 -0400 Date: Mon, 02 May 2022 11:17:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1651490252; bh=HHHACyx/XnYwRV0omI7w54uqPSum4XMN8rosLqXJIoY=; 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=QGFGTpt9d2J2m7wVjw/POfGgoo5fx1RjaSqhV9yTnG8gNA0ILlYAYxcIxwcpiwXmu ypmyi9hAms8iw4bOt4RsssMqjMMFGwQV9W3K+TbNr0bnxYLdcn7nylu7sy1Hc7pgFr MWBimem6JiLNJpwqkIw93sGr++33sXDac+9fSSAM/5QuO29vHX/uWh90IWljI7Kngu e0CCFGWPUmsbIZszPlx/vLyvL/9ut3C6snSDmGa2DcpytkU9AgEmvKIQmK2EiRIeni CM2G+gQ00GHEK7Bc9ojUn85YegUp4vV0FLytIbkLkrcRgBF8MYigznsXp5dO2ylfmZ fxmd4WVTCckyw== From: "Paul A. Patience" Message-ID: <20220502111702.553227-4-paul@apatience.com> In-Reply-To: <20220502111702.553227-1-paul@apatience.com> References: <20220502111702.553227-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1651491029; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: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=HHHACyx/XnYwRV0omI7w54uqPSum4XMN8rosLqXJIoY=; b=OVfDNaKAjbpADogjiTYfXQfKIaukc+YghHOR1gj6iZNDgn/ZVoqZsNBrV28LPAzJ3OMjpB XTSHhV4PIvR3M5KgnmRegns1dfnqXjKAFEL6+CGMn9PAx+zFdvhKjnt9LVTJnvCN7C8Jur dlXanAQ07f4LCBLF9fH3EcA4rnZIrvRlz4K73QhE+UHaaYFKaVAtQL1U18hHoILsnhBDC+ KGKkC2m636+NAXleSo5fQvDTJJHfNda1xZAdBp/Or6AGfspexq+/Z+Y6DjNySDee9EjgC9 todDb6PEbrojflIeOqHMAP/ztY/B58ecgqak9x5d37rqPUfA75ECM+NXk6Ec7Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651491029; a=rsa-sha256; cv=none; b=GHQPrYQXSvD0acjnLES76TA2UJm+1ObBqZpp9grZOGQgWgzXIgmYd5gphdXhM25RweqAbR aNGa5f2B2cXtetbA09bAmnYUbwEKCU9gn7D/249Zl4K1MscEuxA7gCnxzpWZUyQni+0uvq PYyjiqs39jZsDWqV774YqvFfmrPpVVmEuHtstH35mqfFqYr9Xwx1xYFbjqntWZFcREQtnv hb8x+BX2hn0qf2z9fxMX2oxR90x8A9HAPgLdUJBujq9M9kVcef/Mc+oS50mfTqgutPzDto HnLHxQXpfNoERaDJvAfscq4iV78R2VjGu+EdsaiCelV+L6MOpkDpTqZtGz6gNw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=QGFGTpt9; dmarc=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: 3.51 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=QGFGTpt9; dmarc=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: B36B74561F X-Spam-Score: 3.51 X-Migadu-Scanner: scn1.migadu.com X-TUID: CxHxCdeUSa11 * gnu/packages/apl.scm (apl)[arguments]: Use G-expressions. --- gnu/packages/apl.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm index 0a741b0295..e483876cc5 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,22 +55,22 @@ (define-public apl readline sqlite)) (arguments - `(#:configure-flags (list (string-append - "--with-sqlite3=3D" - (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=3D.*") - ,(string-append "SVNINFO=3D" (number->string revision) "= \n")) - ;; Requires running =E2=80=98svn info=E2=80=99 on a versi= oned directory. - (("\\\\\"\\$ARCHIVE_SVNINFO\\\\\"") "\\\"\\\""))))))) + (list #:configure-flags #~(list (string-append + "--with-sqlite3=3D" + #$(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 directo= ry is + ;; unversioned and we know it anyway. + (("^SVNINFO=3D.*") + (string-append "SVNINFO=3D" #$(number->string revi= sion) "\n")) + ;; Requires running =E2=80=98svn info=E2=80=99 on a= versioned directory. + (("\\\\\"\\$ARCHIVE_SVNINFO\\\\\"") "\\\"\\\"")))))= )) (synopsis "APL interpreter") (description "GNU APL is a free interpreter for the programming language APL. I= t is -- 2.36.0