From a3cb302b8a51ad35bf79ab4086d9e2d73278270d Mon Sep 17 00:00:00 2001
From: Hraban Luyat <hraban@0brg.net>
Date: Tue, 11 Apr 2023 13:55:29 -0400
Subject: [PATCH] =?UTF-8?q?refactor:=20don=E2=80=99t=20expose=20sbcl=202.1?=
 =?UTF-8?q?.9=20to=20all-packages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Only give access to it when explicitly requested by CLPM. This prevents
polluting all-packages namespace with a deprecated package.
---
 pkgs/development/tools/clpm/default.nix | 18 ++++++++++++------
 pkgs/top-level/all-packages.nix         |  7 -------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/clpm/default.nix b/pkgs/development/tools/clpm/default.nix
index 06623538a3bc..1a6262913aa4 100644
--- a/pkgs/development/tools/clpm/default.nix
+++ b/pkgs/development/tools/clpm/default.nix
@@ -2,14 +2,20 @@
 , stdenv
 , fetchgit
 , wrapLisp
-# Broken on newer versions:
-# https://gitlab.common-lisp.net/clpm/clpm/-/issues/51
-# Once that bug is fixed, replace this with regular ‘sbcl’ and remove all
-# references to sbcl 2.1.9 from nixpkgs, including from sbcl/2.x.nix.
-, _sbcl_2_1_9
 , openssl
+, sbcl
 }:
 
+# Broken on newer versions:
+# "https://gitlab.common-lisp.net/clpm/clpm/-/issues/51". Once that bug is
+# fixed, remove this, and all 2.1.9 references from the SBCL build file.
+with rec {
+  sbcl_2_1_9 = sbcl.override (_: {
+    version = "2.1.9";
+  });
+};
+
+
 stdenv.mkDerivation rec {
   pname = "clpm";
   version = "0.4.1";
@@ -40,7 +46,7 @@ stdenv.mkDerivation rec {
     # ld to complaing about `impure path used in link`.
     export HOME=$TMP
 
-    ${_sbcl_2_1_9}/bin/sbcl --script scripts/build-release.lisp
+    ${sbcl_2_1_9}/bin/sbcl --script scripts/build-release.lisp
 
     runHook postBuild
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac986e6b12bd..2fe1c7f6c24a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24570,13 +24570,6 @@ with pkgs;
     pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {};
     faslExt = "fasl";
   };
-  # This is a deprecated derivation, marked internal to avoid third party
-  # packages depending on it. It is used for CLPM only, and will be removed
-  # soon.
-  _sbcl_2_1_9 = wrapLisp {
-    pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.9"; };
-    faslExt = "fasl";
-  };
   sbcl_2_2_11 = wrapLisp {
     pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.11"; };
     faslExt = "fasl";