From b70af925f2d5cda466c203a79dc487ec3a2b4ddc Mon Sep 17 00:00:00 2001 From: Hraban Date: Sat, 4 Jul 2026 15:43:45 -0400 Subject: [PATCH 1/2] sbcl: 2.6.5 -> 2.6.6 --- pkgs/development/compilers/sbcl/default.nix | 2 +- pkgs/top-level/all-packages.nix | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 73d3cc08df88..78938c21cfc9 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -30,8 +30,8 @@ let "2.4.10".sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg="; # By unofficial and very loose convention we keep the latest version of # SBCL, and the previous one in case someone quickly needs to roll back. - "2.6.4".sha256 = "sha256-O6U+ZUtg/rfE9QRmGZ1tUmDyZhxxG6ItS3cLZVQA1Xs="; "2.6.5".sha256 = "sha256-kex19kclLtbmrq6bGhP0fHxs/ZtoSI3Gnxpv6lrMtEA="; + "2.6.6".sha256 = "sha256-plp6MIEqr1SSXRGSubnoEPUnx5kRxgALdUgQWu99o0s="; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63838e08073a..985a71a778cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7537,14 +7537,6 @@ with pkgs; ]; }; - sbcl_2_6_4 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.6.4"; }; - faslExt = "fasl"; - flags = [ - "--dynamic-space-size" - "3000" - ]; - }; sbcl_2_6_5 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.6.5"; }; faslExt = "fasl"; @@ -7553,7 +7545,15 @@ with pkgs; "3000" ]; }; - sbcl = sbcl_2_6_5; + sbcl_2_6_6 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.6.6"; }; + faslExt = "fasl"; + flags = [ + "--dynamic-space-size" + "3000" + ]; + }; + sbcl = sbcl_2_6_6; sbclPackages = recurseIntoAttrs sbcl.pkgs; From d15b45bb338629e08d6830d37650ba33febed81f Mon Sep 17 00:00:00 2001 From: Hraban Date: Sat, 4 Jul 2026 15:46:19 -0400 Subject: [PATCH 2/2] sbcl: add iolib and stumpwm to passthru.tests --- pkgs/development/compilers/sbcl/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 78938c21cfc9..112349190c1f 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -7,7 +7,9 @@ coreutils, fetchurl, ps, + sbclPackages, # for passthru.tests strace, + stumpwm, # for passthru.tests texinfo, which, writableTmpDirAsHomeHook, @@ -308,6 +310,11 @@ stdenv.mkDerivation (finalAttrs: { __darwinAllowLocalNetworking = true; + passthru.tests = { + inherit stumpwm; + inherit (sbclPackages) iolib; + }; + meta = { # Broken since 2025-09-05 https://hydra.nixos.org/job/nixpkgs/staging-next/sbcl.x86_64-darwin broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;