From: "Paul A. Patience" <paul@apatience.com>
To: 55182@debbugs.gnu.org
Cc: "Paul A. Patience" <paul@apatience.com>
Subject: [bug#55182] [PATCH v2 1/3] gnu: apl: Update to 1.8-r1550.
Date: Mon, 02 May 2022 11:17:16 +0000 [thread overview]
Message-ID: <20220502111702.553227-2-paul@apatience.com> (raw)
In-Reply-To: <20220502111702.553227-1-paul@apatience.com>
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 © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,9 +20,10 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(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="
- (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="
+ (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\\\\\"") "\\\"\\\"")))))))
+ (synopsis "APL interpreter")
+ (description
+ "GNU APL is a free interpreter for the programming language APL. It is
an implementation of the ISO standard 13751.")
- (license gpl3+)))
+ (license license:gpl3+))))
--
2.36.0
next prev parent reply other threads:[~2022-05-02 11:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-29 11:55 [bug#55182] [PATCH 1/3] gnu: apl: Update to 1.8-r1550 Paul A. Patience
2022-04-29 11:56 ` [bug#55182] [PATCH 2/3] gnu: apl: Remove input labels Paul A. Patience
2022-04-29 11:56 ` [bug#55182] [PATCH 3/3] gnu: apl: Use G-expressions Paul A. Patience
2022-04-29 12:57 ` [bug#55182] [PATCH 1/3] gnu: apl: Update to 1.8-r1550 Maxime Devos
2022-05-02 11:17 ` [bug#55182] [PATCH v2 0/3] " Paul A. Patience
2022-05-02 11:17 ` Paul A. Patience [this message]
2022-05-02 11:17 ` [bug#55182] [PATCH v2 2/3] gnu: apl: Remove input labels Paul A. Patience
2022-05-02 11:17 ` [bug#55182] [PATCH v2 3/3] gnu: apl: Use G-expressions Paul A. Patience
2022-05-02 12:53 ` bug#55182: [PATCH 1/3] gnu: apl: Update to 1.8-r1550 Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220502111702.553227-2-paul@apatience.com \
--to=paul@apatience.com \
--cc=55182@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.