refactor: don’t expose sbcl 2.1.9 to all-packages

Only give access to it when explicitly requested by CLPM. This prevents
polluting all-packages namespace with a deprecated package.

+12 -13
+12 -6
pkgs/development/tools/clpm/default.nix
··· 2 , stdenv 3 , fetchgit 4 , wrapLisp 5 - # Broken on newer versions: 6 - # https://gitlab.common-lisp.net/clpm/clpm/-/issues/51 7 - # Once that bug is fixed, replace this with regular ‘sbcl’ and remove all 8 - # references to sbcl 2.1.9 from nixpkgs, including from sbcl/2.x.nix. 9 - , _sbcl_2_1_9 10 , openssl 11 }: 12 13 stdenv.mkDerivation rec { 14 pname = "clpm"; ··· 40 # ld to complaing about `impure path used in link`. 41 export HOME=$TMP 42 43 - ${_sbcl_2_1_9}/bin/sbcl --script scripts/build-release.lisp 44 45 runHook postBuild 46 '';
··· 2 , stdenv 3 , fetchgit 4 , wrapLisp 5 , openssl 6 + , sbcl 7 }: 8 + 9 + # Broken on newer versions: 10 + # "https://gitlab.common-lisp.net/clpm/clpm/-/issues/51". Once that bug is 11 + # fixed, remove this, and all 2.1.9 references from the SBCL build file. 12 + with rec { 13 + sbcl_2_1_9 = sbcl.override (_: { 14 + version = "2.1.9"; 15 + }); 16 + }; 17 + 18 19 stdenv.mkDerivation rec { 20 pname = "clpm"; ··· 46 # ld to complaing about `impure path used in link`. 47 export HOME=$TMP 48 49 + ${sbcl_2_1_9}/bin/sbcl --script scripts/build-release.lisp 50 51 runHook postBuild 52 '';
-7
pkgs/top-level/all-packages.nix
··· 24570 pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; 24571 faslExt = "fasl"; 24572 }; 24573 - # This is a deprecated derivation, marked internal to avoid third party 24574 - # packages depending on it. It is used for CLPM only, and will be removed 24575 - # soon. 24576 - _sbcl_2_1_9 = wrapLisp { 24577 - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.1.9"; }; 24578 - faslExt = "fasl"; 24579 - }; 24580 sbcl_2_2_11 = wrapLisp { 24581 pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.11"; }; 24582 faslExt = "fasl";
··· 24570 pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; 24571 faslExt = "fasl"; 24572 }; 24573 sbcl_2_2_11 = wrapLisp { 24574 pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.11"; }; 24575 faslExt = "fasl";