From 6fc063c62e3433641cdc210e4aef74d120a05c1d Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@tweag.io>
Date: Thu, 8 Feb 2024 00:49:08 +0100
Subject: [PATCH] Revert "sbcl: move to /pkgs/by-name"

This reverts commit 0a3dab4af34e4d086931d82827bfc8760c3e3150

See the parent commit as to why this is necessary
---
 pkgs/{by-name/sb => development/compilers}/sbcl/bootstrap.nix | 0
 .../package.nix => development/compilers/sbcl/default.nix}    | 0
 .../compilers}/sbcl/fix-2.4.0-aarch64-darwin.patch            | 0
 pkgs/top-level/all-packages.nix                               | 4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{by-name/sb => development/compilers}/sbcl/bootstrap.nix (100%)
 rename pkgs/{by-name/sb/sbcl/package.nix => development/compilers/sbcl/default.nix} (100%)
 rename pkgs/{by-name/sb => development/compilers}/sbcl/fix-2.4.0-aarch64-darwin.patch (100%)

diff --git a/pkgs/by-name/sb/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
similarity index 100%
rename from pkgs/by-name/sb/sbcl/bootstrap.nix
rename to pkgs/development/compilers/sbcl/bootstrap.nix
diff --git a/pkgs/by-name/sb/sbcl/package.nix b/pkgs/development/compilers/sbcl/default.nix
similarity index 100%
rename from pkgs/by-name/sb/sbcl/package.nix
rename to pkgs/development/compilers/sbcl/default.nix
diff --git a/pkgs/by-name/sb/sbcl/fix-2.4.0-aarch64-darwin.patch b/pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch
similarity index 100%
rename from pkgs/by-name/sb/sbcl/fix-2.4.0-aarch64-darwin.patch
rename to pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 441a1439b1c1..b66b781acb3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25939,12 +25939,12 @@ with pkgs;
 
   # Steel Bank Common Lisp
   sbcl_2_4_0 = wrapLisp {
-    pkg = callPackage ../by-name/sb/sbcl/package.nix { version = "2.4.0"; };
+    pkg = callPackage ../development/compilers/sbcl { version = "2.4.0"; };
     faslExt = "fasl";
     flags = [ "--dynamic-space-size" "3000" ];
   };
   sbcl_2_4_1 = wrapLisp {
-    pkg = callPackage ../by-name/sb/sbcl/package.nix { version = "2.4.1"; };
+    pkg = callPackage ../development/compilers/sbcl { version = "2.4.1"; };
     faslExt = "fasl";
     flags = [ "--dynamic-space-size" "3000" ];
   };