guix_mirror_bot pushed a commit to branch lisp-team
in repository guix.
commit 65710af122a66e00b746a06b9fe43f7326f55ccf
Author: Guillaume Le Vaillant <[email protected]>
AuthorDate: Tue Nov 3 11:29:03 2026 +0100
gnu: cl-clml: Update to 0.0.0-1.c34cc7a.
* gnu/packages/patches/sbcl-clml-fix-types.patch: Remove file.
* gnu/packages/patches/sbcl-clml-fix-loop.patch: New file.
* gnu/packages/lisp-xyz.scm (sbcl-clml): Update to 0.0.0-1.c34cc7a.
[source]: Replace sbcl-clml-fix-types patch by sbcl-clml-fix-loop patch.
---
gnu/packages/lisp-xyz.scm | 8 +-
gnu/packages/patches/sbcl-clml-fix-loop.patch | 28 +++
gnu/packages/patches/sbcl-clml-fix-types.patch | 280 -------------------------
3 files changed, 32 insertions(+), 284 deletions(-)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 77d60b02f6e..46496556ef3 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -12314,8 +12314,8 @@ lQuery.")
(sbcl-package->ecl-package sbcl-clip))
(define-public sbcl-clml
- (let ((commit "95505b54c8c7b4b27f500c3be97fa5732f4b51a8")
- (revision "0"))
+ (let ((commit "c34cc7a7c041d3f99e5d3bc5b4abf5caaedfd1dd")
+ (revision "1"))
(package
(name "sbcl-clml")
(version (git-version "0.0.0" revision commit))
@@ -12327,9 +12327,9 @@ lQuery.")
(commit commit)))
(file-name (git-file-name "clml" version))
(sha256
- (base32 "006pii59nmpc61n7p7h8ha5vjg6x0dya327i58z0rnvxs249h345"))
+ (base32 "0m3w59c74z3wdj1g26122svljiq192xhvmx7b2lkb7bxnf4778m1"))
;; TODO: Remove this when the patch has been merged upstream.
- (patches (search-patches "sbcl-clml-fix-types.patch"))))
+ (patches (search-patches "sbcl-clml-fix-loop.patch"))))
(build-system asdf-build-system/sbcl)
(inputs
(list sbcl-alexandria
diff --git a/gnu/packages/patches/sbcl-clml-fix-loop.patch
b/gnu/packages/patches/sbcl-clml-fix-loop.patch
new file mode 100644
index 00000000000..0b61c30bf92
--- /dev/null
+++ b/gnu/packages/patches/sbcl-clml-fix-loop.patch
@@ -0,0 +1,28 @@
+From fd7bea22e5fb2e4439fb4f0724ba9a492615ae26 Mon Sep 17 00:00:00 2001
+From: Guillaume Le Vaillant <[email protected]>
+Date: Tue, 3 Nov 2026 11:06:51 +0100
+Subject: [PATCH] Fix loop for sbcl 2.6.10
+
+---
+ statistics/src/math.lisp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/statistics/src/math.lisp b/statistics/src/math.lisp
+index a96275e..6296ea6 100644
+--- a/statistics/src/math.lisp
++++ b/statistics/src/math.lisp
+@@ -562,9 +562,9 @@ Series \(not very large B):
+ (+ (log bx) +euler-gamma+)))
+ (tolerance (* double-float-epsilon 5.0d0 (abs (+ c tt)))))
+ (loop
+- for tt = tt then (* tt (/ (- x bx) j))
++ for ttt = tt then (* ttt (/ (- x bx) j))
+ for j upfrom 1
+- for change = (/ tt j)
++ for change = (/ ttt j)
+ sum change into s
+ while (> (abs change) tolerance)
+ finally (return (* (- a) (+ c s))))))
+--
+2.55.0
+
diff --git a/gnu/packages/patches/sbcl-clml-fix-types.patch
b/gnu/packages/patches/sbcl-clml-fix-types.patch
deleted file mode 100644
index 689a2fbfc2f..00000000000
--- a/gnu/packages/patches/sbcl-clml-fix-types.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-commit 9920bf86604b536c735b6478488a3cb89413e000
-Author: Guillaume Le Vaillant <[email protected]>
-Date: Tue Dec 1 09:38:41 2020 +0100
-
- Fix some type declarations
-
- This allows compiling with SBCL 2.0.11 which is less tolerant with wrong
type
- declarations.
-
-diff --git a/som/src/lvq_pak.lisp b/som/src/lvq_pak.lisp
-index 1a062cc..4006ed6 100644
---- a/som/src/lvq_pak.lisp
-+++ b/som/src/lvq_pak.lisp
-@@ -53,7 +53,7 @@
- (current :accessor entries-current :initarg :current :initform 0
- :documentation "index of current data-entry inside
data-entries")
- (entries :accessor entries-entries :initarg :entries :initform nil
-- :type #-ccl cons #+ccl list
-+ :type #-ccl (or null cons) #+ccl list
- :documentation "list of data-entries")
- (num-loaded :accessor entries-num-loaded :initarg :num-loaded :initform
nil
- :documentation "number of lines loaded in entries list")
-diff --git a/statistics/src/rand/rand.lisp b/statistics/src/rand/rand.lisp
-index 3cd806a..c8f9952 100644
---- a/statistics/src/rand/rand.lisp
-+++ b/statistics/src/rand/rand.lisp
-@@ -154,7 +154,7 @@
- (xn (make-array (1+ n) :element-type 'double-float)))
- (declare (type double-float r v d)
- (type fixnum k n n-minus-1)
-- (type (vector double-float *) xn))
-+ (type (simple-array double-float (*)) xn))
- ;; build xn
- (setf (aref xn n) (* v (exp (/ (* r r) 2))))
- (setf (aref xn (1- n)) r)
-@@ -233,8 +233,8 @@
- (base (expt 2 (- +bit-operation-m+ k 1))))
- (declare (type double-float r v d)
- (type fixnum k n n-minus-1 base)
-- (type (vector double-float *) wn fn)
-- (type (vector fixnum *) kn))
-+ (type (simple-array double-float (*)) wn fn)
-+ (type (simple-array fixnum (*)) kn))
- ;; build arrays
- (setf (aref wn (- n 1)) (/ (* v (exp (/ (* r r) 2))) base))
- (setf (aref wn (- n 2)) (/ r base))
-@@ -347,8 +347,8 @@
- (base (expt 2 (- +bit-operation-m+ k))))
- (declare (type double-float r v d)
- (type fixnum k n n-minus-1 base)
-- (type (vector double-float *) wn fn)
-- (type (vector fixnum *) kn))
-+ (type (simple-array double-float (*)) wn fn)
-+ (type (simple-array fixnum (*)) kn))
- ;; build arrays
- (setf (aref wn (- n 1)) (/ (* v (exp (/ (* r r) 2))) base))
- (setf (aref wn (- n 2)) (/ r base))
-@@ -546,8 +546,8 @@
- (base (expt 2 (- +bit-operation-m+ k 1))))
- (declare (type double-float r v tr1 tr2)
- (type fixnum k n n-minus-1 base)
-- (type (vector double-float *) wn fn)
-- (type (vector fixnum *) kn))
-+ (type (simple-array double-float (*)) wn fn)
-+ (type (simple-array fixnum (*)) kn))
- ;; build arrays
- (setf (aref wn (- n 1)) (/ (* v (+ 1 (* r r))) base))
- (setf (aref wn (- n 2)) (/ r base))
-@@ -663,8 +663,8 @@
- (base (expt 2 (- +bit-operation-m+ k))))
- (declare (type double-float r v)
- (type fixnum k n n-minus-1 base)
-- (type (vector double-float *) wn fn)
-- (type (vector fixnum *) kn))
-+ (type (simple-array double-float (*)) wn fn)
-+ (type (simple-array fixnum (*)) kn))
- ;; build arrays
- (setf (aref wn (- n 1)) (/ (* v (exp r)) base))
- (setf (aref wn (- n 2)) (/ r base))
-@@ -804,8 +804,8 @@
- (base (expt 2 (- +bit-operation-m+ k 1))))
- (declare (type double-float r v)
- (type fixnum k n n-minus-1 base)
-- (type (vector double-float *) wn fn)
-- (type (vector fixnum *) kn))
-+ (type (simple-array double-float (*)) wn fn)
-+ (type (simple-array fixnum (*)) kn))
- ;; build arrays
- (setf (aref wn (- n 1)) (/ (* v (exp r)) base))
- (setf (aref wn (- n 2)) (/ r base))
-@@ -2083,8 +2083,8 @@
- (base (expt 2 (- +bit-operation-m+ k 1))))
- (declare (type double-float r v tr)
- (type fixnum k n n-minus-1 base)
-- (type (vector double-float *) wn fn)
-- (type (vector fixnum *) kn))
-+ (type (simple-array double-float (*)) wn fn)
-+ (type (simple-array fixnum (*)) kn))
- ;; build arrays
- (setf (aref wn (- n 1)) (/ (* (expt (+ 1d0 tr) 2) v) tr base))
- (setf (aref wn (- n 2)) (/ r base))
-@@ -2383,7 +2383,7 @@
- ans)))
- (declare (type double-float s a d)
- (type vector tix)
-- (type (vector fixnum *) si))
-+ (type (simple-array fixnum (*)) si))
- (values tix si)))
-
- (defun binomial-table-lookup (tix si)
-@@ -2415,7 +2415,7 @@
- (b (expt 2 k)))
- (declare (type double-float s a)
- (type fixnum nsq k b)
-- (type (vector double-float *) pbins))
-+ (type (simple-array double-float (*)) pbins))
- ;; build pbins
- (setf (aref pbins 0) (int-power (- 1d0 probability) size))
- (loop for i from 1 to size do
-@@ -2438,7 +2438,7 @@
- do (incf j tx)) :initial-element -1
:element-type 'fixnum))
- (thetan 0d0))
- (declare (type double-float w thetan)
-- (type (vector fixnum *) table))
-+ (type (simple-array fixnum (*)) table))
- (loop with j = 0
- for x from 0
- for pbin across pbins
-@@ -2454,8 +2454,8 @@
- (vi (make-array nsq :element-type 'double-float
- :initial-contents (loop for i from 0 to size
collect (dfloat (/ (+ i 1) nsq)))))
- (c (dfloat (/ nsq))))
-- (declare (type (vector fixnum *) ki)
-- (type (vector double-float *) vi)
-+ (declare (type (simple-array fixnum (*)) ki)
-+ (type (simple-array double-float (*)) vi)
- (type double-float c))
- (loop repeat size do
- (let ((maxp 0)
-@@ -2658,7 +2658,7 @@
- (thetan 0d0)
- (sum 0d0))
- (declare (type double-float w thetan sum)
-- (type (vector fixnum *) table))
-+ (type (simple-array fixnum (*)) table))
- (loop with j = 0
- for x from 0
- for pgeo across pgeos
-@@ -2675,8 +2675,8 @@
- (vi (make-array nsq :element-type 'double-float
- :initial-contents (loop for i from 0 below nsq
collect (dfloat (/ (+ i 1) nsq)))))
- (c (dfloat (/ nsq))))
-- (declare (type (vector fixnum *) ki)
-- (type (vector double-float *) vi)
-+ (declare (type (simple-array fixnum (*)) ki)
-+ (type (simple-array double-float (*)) vi)
- (type double-float c))
- (loop repeat (1- nsq) do
- (let ((maxp 0)
-@@ -2911,7 +2911,7 @@
- (sum 0d0))
- (declare (type double-float w thetan sum pl pu)
- (type fixnum nsq d)
-- (type (vector fixnum *) table))
-+ (type (simple-array fixnum (*)) table))
- (unless (= xl 0)
- (setf pps (subseq pps xl)))
- (loop with j = 0
-@@ -2930,8 +2930,8 @@
- (vi (make-array nsq :element-type 'double-float
- :initial-contents (loop for i from 0 below nsq
collect (dfloat (/ (+ i 1) nsq)))))
- (c (dfloat (/ nsq))))
-- (declare (type (vector fixnum *) ki)
-- (type (vector double-float *) vi)
-+ (declare (type (simple-array fixnum (*)) ki)
-+ (type (simple-array double-float (*)) vi)
- (type double-float c))
- (loop repeat (1- nsq) do
- (let ((maxp 0)
-@@ -3174,7 +3174,7 @@
- (k 7)
- (b (expt 2 k)))
- (declare (type fixnum a1 a2 nsq k b)
-- (type (vector double-float *) phs))
-+ (type (simple-array double-float (*)) phs))
- ;; build phs
- (setf (aref phs 0)
- (/ (dfloat (the fixnum (* (combination successes a1) (combination (-
elements successes) (- samples a1)))))
-@@ -3200,7 +3200,7 @@
- (table (make-array b :initial-element -1 :element-type 'fixnum))
- (thetan 0d0))
- (declare (type double-float w thetan)
-- (type (vector fixnum *) table))
-+ (type (simple-array fixnum (*)) table))
- (loop with j = 0
- for x from a1
- for i from 0
-@@ -3217,8 +3217,8 @@
- (vi (make-array nsq :element-type 'double-float
- :initial-contents (loop for i from 0 below nsq
collect (dfloat (/ (+ i 1) nsq)))))
- (c (dfloat (/ nsq))))
-- (declare (type (vector fixnum *) ki)
-- (type (vector double-float *) vi)
-+ (declare (type (simple-array fixnum (*)) ki)
-+ (type (simple-array double-float (*)) vi)
- (type double-float c))
- (loop repeat (1- nsq) do
- (let ((maxp 0)
-@@ -3442,7 +3442,7 @@
- (sum 0d0))
- (declare (type double-float w thetan sum pl pu)
- (type fixnum nsq d)
-- (type (vector fixnum *) table))
-+ (type (simple-array fixnum (*)) table))
- (unless (= xl 0)
- (setf pnbs (subseq pnbs xl)))
- (loop with j = 0
-@@ -3461,8 +3461,8 @@
- (vi (make-array nsq :element-type 'double-float
- :initial-contents (loop for i from 0 below nsq
collect (dfloat (/ (+ i 1) nsq)))))
- (c (dfloat (/ nsq))))
-- (declare (type (vector fixnum *) ki)
-- (type (vector double-float *) vi)
-+ (declare (type (simple-array fixnum (*)) ki)
-+ (type (simple-array double-float (*)) vi)
- (type double-float c))
- (loop repeat (1- nsq) do
- (let ((maxp 0)
-diff --git a/time-series/src/ts-read-data.lisp
b/time-series/src/ts-read-data.lisp
-index 09ad933..a692514 100644
---- a/time-series/src/ts-read-data.lisp
-+++ b/time-series/src/ts-read-data.lisp
-@@ -5,7 +5,7 @@
- ((frequency :initarg :frequency
- :accessor ts-freq
- :initform nil
-- :type number)
-+ :type (or null number))
- (start :initarg :start :accessor ts-start :initform nil)
- (end :initarg :end :accessor ts-end :initform nil)
- (ts-type :initarg :ts-type :accessor ts-type :initform nil)
-diff --git a/time-series/src/ts-state-space-model.lisp
b/time-series/src/ts-state-space-model.lisp
-index 4dbf56a..ad9e5cc 100644
---- a/time-series/src/ts-state-space-model.lisp
-+++ b/time-series/src/ts-state-space-model.lisp
-@@ -348,8 +348,8 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- (eval-when (:execute :compile-toplevel :load-toplevel)
- (defclass trend-model (gaussian-stsp-model)
-- ((diff-k :initarg :diff-k :initform nil :type integer :accessor diff-k)
-- (tau^2 :initarg :tau^2 :initform nil :type number :accessor tau^2)
-+ ((diff-k :initarg :diff-k :initform nil :type (or null integer) :accessor
diff-k)
-+ (tau^2 :initarg :tau^2 :initform nil :type (or null number) :accessor
tau^2)
- (aic :initarg :aic :initform +nan+ :type number))
- (:documentation "- parent: gaussian-stsp-model
- - accessors:
-@@ -492,9 +492,9 @@
- ; seasonal model ;
- ;;;;;;;;;;;;;;;;;;
- (defclass seasonal-model (gaussian-stsp-model)
-- ((s-deg :initarg :s-deg :initform nil :type fixnum :accessor s-deg)
-- (s-freq :initarg :s-freq :initform nil :type fixnum :accessor s-freq)
-- (tau^2 :initarg :tau^2 :initform nil :type number :accessor tau^2))
-+ ((s-deg :initarg :s-deg :initform nil :type (or null fixnum) :accessor
s-deg)
-+ (s-freq :initarg :s-freq :initform nil :type (or null fixnum) :accessor
s-freq)
-+ (tau^2 :initarg :tau^2 :initform nil :type (or null number) :accessor
tau^2))
- (:documentation "- parent: gaussian-stsp-model
- - accessors
- - s-deg : Degree for seasonal model
-@@ -593,8 +593,8 @@
- ; seasonal-adjustment-model ;
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- (defclass seasonal-adjustment-model (gaussian-stsp-model)
-- ((trend :initarg :trend :initform nil :type trend-model :accessor
trend-model)
-- (seasonal :initarg :seasonal :initform nil :type seasonal-model :accessor
seasonal-model))
-+ ((trend :initarg :trend :initform nil :type (or null trend-model) :accessor
trend-model)
-+ (seasonal :initarg :seasonal :initform nil :type (or null seasonal-model)
:accessor seasonal-model))
- (:documentation "Standard seasonal adjustment model ( Trend + Seasonal )
- - parent: gaussian-stsp-model
- - accessors