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 MFXOJBHAb2ItMgAAbAwnHQ (envelope-from ) for ; Mon, 02 May 2022 13:27:13 +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 AF65JBHAb2JoZQEAauVa8A (envelope-from ) for ; Mon, 02 May 2022 13:27:13 +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 37C0B453BB for ; Mon, 2 May 2022 13:27:12 +0200 (CEST) Received: from localhost ([::1]:34288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlUCs-0003J5-Ri for larch@yhetil.org; Mon, 02 May 2022 07:27:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlU43-0000G1-FZ for guix-patches@gnu.org; Mon, 02 May 2022 07:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41106) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlU43-0005Py-5e 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-0005er-21 for guix-patches@gnu.org; Mon, 02 May 2022 07:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55182] [PATCH v2 1/3] gnu: apl: Update to 1.8-r1550. 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.165149025421661 (code B ref 55182); Mon, 02 May 2022 11:18:03 +0000 Received: (at 55182) by debbugs.gnu.org; 2 May 2022 11:17:34 +0000 Received: from localhost ([127.0.0.1]:34990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlU3V-0005Yt-J7 for submit@debbugs.gnu.org; Mon, 02 May 2022 07:17:34 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:20159) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlU3T-0005UG-Ri for 55182@debbugs.gnu.org; Mon, 02 May 2022 07:17:28 -0400 Date: Mon, 02 May 2022 11:17:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1651490241; bh=M/6Rbfbm7QhRJUhOjm5cHS57MYpue5Th/XxiR39C2t8=; 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=hXgDBJLI9C2TZ+1nq05PM90DthoFQbvFCDJlE9Tt4guURLuqJgZNsneOQk+cmSi/I raAbBaN84sSgxZ8WRswlNiD9abhATeZwizscTT6U7BonfLd9Ed0sqqU+VpToUhRJ6Y ge1/aQiBAMRa76mW5lkca4jkJ1J2x/fOYAQD4fbbkBoMWG0E8msaUgAP1TxJGCFAj8 RZfiRH9zS/d9H0jVDSt+RfnanOHwuIBGwDYQwC2yt1xfnE06gTBk6zASsHgjQBXYAJ scaXTzH/Snry5YlecbT1M4x8T5VOrQoG++jqDT48lNBKsroQbUVKcaTM395A1DGozj mqt4jFlrlPC6w== From: "Paul A. Patience" Message-ID: <20220502111702.553227-2-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=1651490832; 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=M/6Rbfbm7QhRJUhOjm5cHS57MYpue5Th/XxiR39C2t8=; b=jz9vQV+Y0r4YmPgIcsw+kkGoydrVA3PZ4u5F0elK3xD1yGqgg/pvGJ1cf42zAoQ3+ks+ti 4Kj3GedYty5ImmwojIUapgDCegqd4ooeEjuRwevuAq1qFO8WREr+W4IzItWABLT9DGvMOZ XEgzA+kV8it8QlOHndwoOjijTRzGk9Vd1/cM71EkfRVIbuw1/2m4+M0PTEgDDE9kL3HnZx gw2fs/keb5S0ogONG4Kc+iWS9mDWTDwF/yjmw8LGZskBn5wplkogFgyE69QLFA2H+U0i/Q km379nGlE/iZ21QxHxs5PhwPBHYUXUjkFlsSSzcU8bz4RR5ubS9gds2dWN7uZg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651490832; a=rsa-sha256; cv=none; b=g05vZe5yz9jpy6bToIg0BgShIFVOSRnECMBaVuFrPoTSN/C2bHgDIOXGVf5XNsmHDfiWdB P4Zau31PvgfglzscD+UN6ln73SMw6eGNFfV8I+AvXEWH8ID4tit15zplyJzp4XuO7dZTST +wV29DgNST+mPikmcqM05ZWvJydYl4g496NzgC2Al1sxHcNu5767H/zUEwVLCilTd9UyMI wZcSuiBrIQzqe5ouPBTMLb5YGQ4HdWLj1fqFX+uCE7RYqrA8qvGikUNO0bFbHDts6xo5cH cvLOM8XNyJ97HOTnnFGWX/1/pJ1uxqKwkMRPb2jHgg1Lg/vwSZiqeV9Ac6JyZQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=hXgDBJLI; 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: 2.41 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=hXgDBJLI; 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: 37C0B453BB X-Spam-Score: 2.41 X-Migadu-Scanner: scn0.migadu.com X-TUID: oXghEnqfpH9g This commit fixes a failing build caused by -Werror (the configure script no longer sets the -Werror compilation flag). * gnu/packages/apl.scm (apl): Update to 1.8-r1550. [arguments]: Add 'fix-configure' phase. [license]: Prefix with 'license:'. --- gnu/packages/apl.scm | 74 +++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 28 deletions(-) diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm index badec04333..ad9f4504bf 100644 --- a/gnu/packages/apl.scm +++ b/gnu/packages/apl.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2013 Nikita Karetnikov ;;; Copyright =C2=A9 2014, 2015 Mark H Weaver ;;; Copyright =C2=A9 2017, 2019 Efraim Flashner +;;; Copyright =C2=A9 2022 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,9 +20,10 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages apl) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module (guix packages) - #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages gettext) #:use-module (gnu packages maths) @@ -30,30 +32,46 @@ (define-module (gnu packages apl) #:use-module (gnu packages sqlite)) (define-public apl - (package - (name "apl") - (version "1.8") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/apl/apl-" version ".tar.gz")) - (sha256 - (base32 - "1jxvv2h3y1am1fw6r5sn3say1n0dj8shmscbybl0qhqdia2lqkql")))) - (build-system gnu-build-system) - (home-page "https://www.gnu.org/software/apl/") - (inputs - `(("gettext" ,gettext-minimal) - ("lapack" ,lapack) - ("pcre" ,pcre2) - ("sqlite" ,sqlite) - ("readline" ,readline))) - (arguments - `(#:configure-flags (list (string-append - "--with-sqlite3=3D" - (assoc-ref %build-inputs "sqlite"))))) - (synopsis "APL interpreter") - (description - "GNU APL is a free interpreter for the programming language APL. It = is + (let ((revision 1550)) + (package + (name "apl") + (version (string-append "1.8-r" (number->string revision))) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "svn://svn.savannah.gnu.org/apl/trunk") + (revision revision))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bgc3a09f35zrqq2irhm1hspppnxjqas0fmcw14hkc7910br9ip3"))= )) + (build-system gnu-build-system) + (home-page "https://www.gnu.org/software/apl/") + (inputs + `(("gettext" ,gettext-minimal) + ("lapack" ,lapack) + ("pcre" ,pcre2) + ("sqlite" ,sqlite) + ("readline" ,readline))) + (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\\\\\"") "\\\"\\\""))))))) + (synopsis "APL interpreter") + (description + "GNU APL is a free interpreter for the programming language APL. I= t is an implementation of the ISO standard 13751.") - (license gpl3+))) + (license license:gpl3+)))) -- 2.36.0