diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2dacba2d7bb0..3d3028c61006 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14294,8 +14294,6 @@ with pkgs;
 
   cmdstan = callPackage ../development/compilers/cmdstan { };
 
-  cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { };
-
   comby = callPackage ../development/tools/comby { };
 
   inherit (coqPackages) compcert;
@@ -14850,10 +14848,6 @@ with pkgs;
     backend = "llvm";
   };
 
-  gcl = callPackage ../development/compilers/gcl {
-    gmp = gmp4;
-  };
-
   gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { };
 
   gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {};
@@ -15386,8 +15380,6 @@ with pkgs;
 
   miranda = callPackage ../development/compilers/miranda {};
 
-  mkcl = callPackage ../development/compilers/mkcl {};
-
   mlkit = callPackage ../development/compilers/mlkit {};
 
   inherit (callPackage ../development/compilers/mlton {})
@@ -24220,6 +24212,15 @@ with pkgs;
     flags = ["-E" "UTF-8"];
   };
 
+  wrapLispi686Linux = pkgsi686Linux.callPackage ../development/lisp-modules/nix-cl.nix {};
+  
+  # CMU Common Lisp
+  cmucl_binary = wrapLispi686Linux {
+    pkg = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { };
+    faslExt = "sse2f";
+    program = "lisp";
+  };
+
   # Embeddable Common Lisp
   ecl = wrapLisp {
     pkg = callPackage ../development/compilers/ecl { };
@@ -24230,6 +24231,20 @@ with pkgs;
     faslExt = "fas";
   };
 
+  # GNU Common Lisp
+  gcl = wrapLisp {
+    pkg = callPackage ../development/compilers/gcl {
+      gmp = gmp4;
+    };
+    faslExt = "o";
+  };
+
+  # ManKai Common Lisp
+  mkcl = wrapLisp {
+    pkg = callPackage ../development/compilers/mkcl {};
+    faslExt = "fas";
+  };
+
   # Steel Bank Common Lisp
   sbclBootstrap = wrapLisp {
     pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {};