[bug#55942] [PATCH 1/3] gnu: serapeum: Remove input labels.

[bug#55942] [PATCH 1/3] gnu: serapeum: Remove input labels.

[Paul A. Patience]

* gnu/packages/lisp-xyz.scm (serapeum)[inputs, native-inputs]: Remove
labels.
---
 gnu/packages/lisp-xyz.scm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index c3b14135a3..e2c8e06f92 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -7521,22 +7521,22 @@ (define-public sbcl-serapeum
           (base32 "0vij9jhji09way1rpd0r5sgjnh5amm3f2ymppnqkw0c6nnk2p0kd"))))
       (build-system asdf-build-system/sbcl)
       (inputs
-       `(("alexandria" ,sbcl-alexandria)
-         ("trivia" ,sbcl-trivia)
-         ("split-sequence" ,sbcl-split-sequence)
-         ("string-case" ,sbcl-string-case)
-         ("parse-number" ,sbcl-parse-number)
-         ("trivial-garbage" ,sbcl-trivial-garbage)
-         ("bordeaux-threads" ,sbcl-bordeaux-threads)
-         ("named-readtables" ,sbcl-named-readtables)
-         ("fare-quasiquote" ,sbcl-fare-quasiquote)
-         ("parse-declarations-1.0" ,sbcl-parse-declarations)
-         ("global-vars" ,sbcl-global-vars)
-         ("trivial-file-size" ,sbcl-trivial-file-size)
-         ("trivial-macroexpand-all" ,sbcl-trivial-macroexpand-all)))
+       (list sbcl-alexandria
+             sbcl-trivia
+             sbcl-split-sequence
+             sbcl-string-case
+             sbcl-parse-number
+             sbcl-trivial-garbage
+             sbcl-bordeaux-threads
+             sbcl-named-readtables
+             sbcl-fare-quasiquote
+             sbcl-parse-declarations
+             sbcl-global-vars
+             sbcl-trivial-file-size
+             sbcl-trivial-macroexpand-all))
       (native-inputs
-       `(("fiveam" ,sbcl-fiveam)
-         ("local-time" ,sbcl-local-time)))
+       (list sbcl-fiveam
+             sbcl-local-time))
       (arguments
        '(#:phases
          (modify-phases %standard-phases
--
2.36.1

[bug#55942] [PATCH 2/3] gnu: serapeum: Use G-expressions.

[Paul A. Patience]

* gnu/packages/lisp-xyz.scm (serapeum)[arguments]: Use G-expressions and
simplify the 'disable-failing-tests' phase.
---
 gnu/packages/lisp-xyz.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index e2c8e06f92..cf8af2fc89 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -7538,14 +7538,13 @@ (define-public sbcl-serapeum
        (list sbcl-fiveam
              sbcl-local-time))
       (arguments
-       '(#:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'disable-failing-tests
-             (lambda* (#:key inputs #:allow-other-keys)
-               (substitute* "serapeum.asd"
-                 ;; Guix does not have Quicklisp, and probably never will.
-                 (("\\(:file \"quicklisp\"\\)") ""))
-               #t)))))
+       (list #:phases
+             #~(modify-phases %standard-phases
+                 (add-after 'unpack 'disable-failing-tests
+                   (lambda _
+                     (substitute* "serapeum.asd"
+                       ;; Guix does not have Quicklisp, and probably never will.
+                       (("\\(:file \"quicklisp\"\\)") "")))))))
       (synopsis "Common Lisp utility library beyond Alexandria")
       (description
        "Serapeum is a conservative library of Common Lisp utilities.  It is a
--
2.36.1

[bug#55942] [PATCH 3/3] gnu: serapeum: Update to 0.0.0-7.d2150c6.

[Paul A. Patience]

* gnu/packages/lisp-xyz.scm (serapeum): Update to 0.0.0-7.d2150c6.
[inputs]: Remove sbcl-named-readtables and sbcl-fare-quasiquote.
Add sbcl-introspect-environment and sbcl-trivial-cltl2.
[native-inputs]: Add sbcl-atomics.
---
 gnu/packages/lisp-xyz.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index cf8af2fc89..8ebb66b212 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -7504,8 +7504,8 @@ (define-public ecl-trivial-macroexpand-all
   (sbcl-package->ecl-package sbcl-trivial-macroexpand-all))

 (define-public sbcl-serapeum
-  (let ((commit "c29a52ff0c5f6e60b09919c3a0daa8df7599ddb9")
-        (revision "6"))
+  (let ((commit "d2150c6fb75c16f2ee0abd145a1089d0019e7f7e")
+        (revision "7"))
     (package
       (name "sbcl-serapeum")
       (version (git-version "0.0.0" revision commit))
@@ -7518,7 +7518,7 @@ (define-public sbcl-serapeum
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0vij9jhji09way1rpd0r5sgjnh5amm3f2ymppnqkw0c6nnk2p0kd"))))
+          (base32 "1czs771nyqz45ndd09iiva2swvazy1b2z0k6h4qqdd839vnjcs06"))))
       (build-system asdf-build-system/sbcl)
       (inputs
        (list sbcl-alexandria
@@ -7528,14 +7528,15 @@ (define-public sbcl-serapeum
              sbcl-parse-number
              sbcl-trivial-garbage
              sbcl-bordeaux-threads
-             sbcl-named-readtables
-             sbcl-fare-quasiquote
              sbcl-parse-declarations
+             sbcl-introspect-environment
+             sbcl-trivial-cltl2
              sbcl-global-vars
              sbcl-trivial-file-size
              sbcl-trivial-macroexpand-all))
       (native-inputs
-       (list sbcl-fiveam
+       (list sbcl-atomics
+             sbcl-fiveam
              sbcl-local-time))
       (arguments
        (list #:phases
--
2.36.1

bug#55942: [PATCH 3/3] gnu: serapeum: Update to 0.0.0-7.d2150c6.

[Guillaume Le Vaillant]

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

Patches pushed as 240ac3b75cb5b3140f5d0c917884e6dedee863be and
following.
Thanks.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]