From b0b0d5cb7df2b70b4dc4bfaa58f9daea4e4d6785 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 16 Feb 2026 13:26:18 -0800
Subject: [PATCH] sbclPackages.cl-ana_dot_makeres: remove override for package
 deleted in Quicklisp update

The cl-ana_dot_makeres package was removed from imported.nix in
131418601897 (lispPackages: update from quickisp-2026-01-01) on staging.
The override added in bdd4fb5000 on master now references a
nonexistent package, causing an eval failure on staging-next.

(cherry picked from commit 3ae63fbd7051c99e78c07e304e42130ef0cbd433)
---
 .../patches/cl-ana-fix-type-error.patch       | 21 -------------------
 pkgs/development/lisp-modules/ql.nix          |  3 ---
 2 files changed, 24 deletions(-)
 delete mode 100644 pkgs/development/lisp-modules/patches/cl-ana-fix-type-error.patch

diff --git a/pkgs/development/lisp-modules/patches/cl-ana-fix-type-error.patch b/pkgs/development/lisp-modules/patches/cl-ana-fix-type-error.patch
deleted file mode 100644
index de31a1255931..000000000000
--- a/pkgs/development/lisp-modules/patches/cl-ana-fix-type-error.patch
+++ /dev/null
@@ -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))))))))))
-
diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix
index 624c7a04cc34..39d41370ed11 100644
--- a/pkgs/development/lisp-modules/ql.nix
+++ b/pkgs/development/lisp-modules/ql.nix
@@ -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 ];