[bug#55182] [PATCH 1/3] gnu: apl: Update to 1.8-r1550.

[bug#55182] [PATCH 1/3] gnu: apl: Update to 1.8-r1550.

[Paul A. Patience]

This commit fixes a failing build caused by -Werror (the configure
script no longer sets the -Werror compilation flag).
It also ensures no build information is leaked (through GNU APL's
--show_src_dir and --show_all_dirs flags).

* gnu/packages/apl.scm (apl): Update to 1.8-r1550.
[arguments]: Add 'fix-configure' phase.
[license]: Prefix with 'license:'.
---
 gnu/packages/apl.scm | 76 ++++++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm
index badec04333..485d3aa296 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,48 @@ (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\\\\\"") "\\\"\\\"")
+                 ;; Don't leak build information.
+                 (("\\\\\"\\$abs_srcdir\\\\\"") "\\\"\\\"")))))))
+      (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

[bug#55182] [PATCH 2/3] gnu: apl: Remove input labels.

[Paul A. Patience]

* gnu/packages/apl.scm (apl)[inputs]: Remove labels and sort inputs.
---
 gnu/packages/apl.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm
index 485d3aa296..9c4b9a48e1 100644
--- a/gnu/packages/apl.scm
+++ b/gnu/packages/apl.scm
@@ -48,11 +48,11 @@ (define-public apl
       (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)))
+       (list gettext-minimal
+             lapack
+             pcre2
+             readline
+             sqlite))
       (arguments
        `(#:configure-flags (list (string-append
                                   "--with-sqlite3="
--
2.36.0

[bug#55182] [PATCH 3/3] gnu: apl: Use G-expressions.

[Paul A. Patience]

* gnu/packages/apl.scm (apl)[arguments]: Use G-expressions.
---
 gnu/packages/apl.scm | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

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
--
2.36.0

[bug#55182] [PATCH 1/3] gnu: apl: Update to 1.8-r1550.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

Paul A. Patience schreef op vr 29-04-2022 om 11:55 [+0000]:
> +                 ;; Don't leak build information.
> +                 (("\\\\\"\\$abs_srcdir\\\\\"") "\\\"\\\"")))))))

Due to container shenanigans, recording the build directory (/tmp/guix-
build-...) does not form a reproducibility problem in Guix.  (The
builder sees /tmp/guix-build-...-0 even though it is named /tmp/guix-
build-...-N outside the builder.)

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#55182] [PATCH v2 0/3] gnu: apl: Update to 1.8-r1550.

[Paul A. Patience]

Addressed Maxime Devos's comments.

Paul A. Patience (3):
  gnu: apl: Update to 1.8-r1550.
  gnu: apl: Remove input labels.
  gnu: apl: Use G-expressions.

 gnu/packages/apl.scm | 75 +++++++++++++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 28 deletions(-)

--
2.36.0

[bug#55182] [PATCH v2 1/3] gnu: apl: Update to 1.8-r1550.

[Paul A. Patience]

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

[bug#55182] [PATCH v2 2/3] gnu: apl: Remove input labels.

[Paul A. Patience]

* gnu/packages/apl.scm (apl)[inputs]: Remove labels and sort.
---
 gnu/packages/apl.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm
index ad9f4504bf..0a741b0295 100644
--- a/gnu/packages/apl.scm
+++ b/gnu/packages/apl.scm
@@ -48,11 +48,11 @@ (define-public apl
       (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)))
+       (list gettext-minimal
+             lapack
+             pcre2
+             readline
+             sqlite))
       (arguments
        `(#:configure-flags (list (string-append
                                   "--with-sqlite3="
--
2.36.0

[bug#55182] [PATCH v2 3/3] gnu: apl: Use G-expressions.

[Paul A. Patience]

* 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="
-                                  (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\\\\\"") "\\\"\\\"")))))))
+       (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\\\\\"") "\\\"\\\"")))))))
       (synopsis "APL interpreter")
       (description
        "GNU APL is a free interpreter for the programming language APL.  It is
--
2.36.0

bug#55182: [PATCH 1/3] gnu: apl: Update to 1.8-r1550.

[Ludovic Courtès]

Hi,

"Paul A. Patience" <paul@apatience.com> skribis:

>   gnu: apl: Update to 1.8-r1550.
>   gnu: apl: Remove input labels.
>   gnu: apl: Use G-expressions.

Applied, thanks!  And thanks Maxime for reviewing, as always.

Ludo’.