This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new e704ee00c6 gnu: sbcl-cl-ana: Update to 0.0.0-3.88abde5.
e704ee00c6 is described below
commit e704ee00c676a823614983d9008aae4136b4f808
Author: jgart <[email protected]>
AuthorDate: Wed Mar 11 12:15:16 2026 -0400
gnu: sbcl-cl-ana: Update to 0.0.0-3.88abde5.
* gnu/packages/lisp-xyz.scm (sbcl-cl-ana): Update to 0.0.0-3.88abde5.
[sources]: Add patch.
* gnu/packages/patches/cl-ana-pr-49.patch: Include patch file.
* gnu/local.mk (dist_patch_DATA): Register it.
Change-Id: I352e36708ddbb5c1700b18425485fcb60125ca6e
---
gnu/local.mk | 3 ++-
gnu/packages/lisp-xyz.scm | 7 ++++---
gnu/packages/patches/cl-ana-pr-49.patch | 33 +++++++++++++++++++++++++++++++++
3 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 6347bae26a..b5bd20a5cb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -55,7 +55,7 @@
# Copyright © 2022 Hilton Chain <[email protected]>
# Copyright © 2022 Alex Griffin <[email protected]>
# Copyright © 2022 ( <[email protected]>
-# Copyright © 2022 jgart <[email protected]>
+# Copyright © 2022, 2026 jgart <[email protected]>
# Copyright © 2023-2025 Zheng Junjie <[email protected]>
# Copyright © 2023 Ivana Drazovic <[email protected]>
# Copyright © 2023 Andy Tai <[email protected]>
@@ -1092,6 +1092,7 @@ dist_patch_DATA =
\
%D%/packages/patches/ceph-fix-cmake.patch \
%D%/packages/patches/cf-tool-add-languages.patch \
%D%/packages/patches/chmlib-inttypes.patch \
+ %D%/packages/patches/cl-ana-pr-49.patch \
%D%/packages/patches/cl-asdf-config-directories.patch \
%D%/packages/patches/clamav-config-llvm-libs.patch \
%D%/packages/patches/clamav-system-tomsfastmath.patch \
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index c275c5843c..5262a3c847 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -4394,8 +4394,8 @@ Lisp expressions in multiple implementations.")
(sbcl-package->cl-source-package sbcl-cl-all))
(define-public sbcl-cl-ana
- (let ((commit "848185eed1ed65bab3a124870c122f761ce0d87e")
- (revision "2"))
+ (let ((commit "88abde5ad3fa327958720426b89a8457e6943b94")
+ (revision "3"))
(package
(name "sbcl-cl-ana")
(version (git-version "0.0.0" revision commit))
@@ -4406,8 +4406,9 @@ Lisp expressions in multiple implementations.")
(url "https://github.com/ghollisjr/cl-ana";)
(commit commit)))
(file-name (git-file-name "cl-ana" version))
+ (patches (search-patches "cl-ana-pr-49.patch"))
(sha256
- (base32 "026agqsxq3pg2k9jmy2wysil2z0yn5rykzzhr8rqxsspdwz51z1y"))))
+ (base32 "1dg8wkc2bv66lykr2fjgn91jw7aa9xnpk20h0g8pp2xr6981gfl9"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list openmpi ;; for hdf-cffi
diff --git a/gnu/packages/patches/cl-ana-pr-49.patch
b/gnu/packages/patches/cl-ana-pr-49.patch
new file mode 100644
index 0000000000..31330a41ae
--- /dev/null
+++ b/gnu/packages/patches/cl-ana-pr-49.patch
@@ -0,0 +1,33 @@
+Upstream status: https://github.com/ghollisjr/cl-ana/pull/49
+
+From 491ba1127126ca6209b7c4dc1485377c7f772f7e Mon Sep 17 00:00:00 2001
+From: Philip Taron <[email protected]>
+Date: Mon, 16 Feb 2026 12:32:04 -0800
+Subject: [PATCH] Fix type error in fixed-mem-cache for SBCL 2.6.0
+
+In cl-ana.makeres, the fixed-mem-cache function uses
+(setf (cdr (last cache)) (list id)) where cache can be nil (initial
+state or after popping all elements). (last nil) returns nil, making
+(setf (cdr nil) ...) undefined. SBCL 2.6.0's stricter type inference
+catches this as a type conflict, causing COMPILE-FILE-ERROR.
+
+Replace with nconc which handles the nil case correctly.
+---
+ makeres/makeres.lisp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/makeres/makeres.lisp b/makeres/makeres.lisp
+index 1999ac4..373bb57 100644
+--- a/makeres/makeres.lisp
++++ b/makeres/makeres.lisp
+@@ -936,8 +936,8 @@ compressed storage, but alas."
+ (> total maxmem))
+ do (unload-target (pop cache))))
+ (load-target id)
+- (setf (cdr (last cache))
+- (list id)))))))))
++ (setf cache
++ (nconc cache (list id))))))))))
+
+ ;; Caching utility functions:
+
