sbclPackages.cl-ana_dot_makeres: remove override for package deleted in Quicklisp update
The cl-ana_dot_makeres package was removed from imported.nix in1314186018(lispPackages: update from quickisp-2026-01-01) on staging. The override added inbdd4fb5000on master now references a nonexistent package, causing an eval failure on staging-next.
This commit is contained in:
@@ -1,21 +0,0 @@
|
||||
Fix type error in fixed-mem-cache for SBCL 2.6.0
|
||||
|
||||
cache starts as nil and may be emptied by the loop, so (last cache)
|
||||
can return nil. (setf (cdr nil) ...) is undefined behavior that
|
||||
SBCL 2.6.0 now catches as a type conflict during compilation,
|
||||
causing COMPILE-FILE-ERROR.
|
||||
|
||||
Use nconc instead, which handles the nil case correctly.
|
||||
|
||||
Upstream issue: https://github.com/ghollisjr/cl-ana/issues/48
|
||||
|
||||
--- a/makeres/makeres.lisp
|
||||
+++ b/makeres/makeres.lisp
|
||||
@@ -936,5 +936,5 @@
|
||||
do (unload-target (pop cache))))
|
||||
(load-target id)
|
||||
- (setf (cdr (last cache))
|
||||
- (list id)))))))))
|
||||
+ (setf cache
|
||||
+ (nconc cache (list id))))))))))
|
||||
|
||||
@@ -191,9 +191,6 @@ let
|
||||
"iolib/pathnames"
|
||||
];
|
||||
});
|
||||
cl-ana_dot_makeres = super.cl-ana_dot_makeres.overrideLispAttrs (o: {
|
||||
patches = (o.patches or [ ]) ++ [ ./patches/cl-ana-fix-type-error.patch ];
|
||||
});
|
||||
cl-ana_dot_hdf-cffi = super.cl-ana_dot_hdf-cffi.overrideLispAttrs (o: {
|
||||
nativeBuildInputs = [ pkgs.hdf5 ];
|
||||
nativeLibs = [ pkgs.hdf5 ];
|
||||
|
||||
Reference in New Issue
Block a user