Merge pull request #193991 from hraban/sbcl-2.2.9

sbcl: 2.2.6 -> 2.2.9
This commit is contained in:
7c6f434c 2022-10-02 21:14:19 +00:00 committed by GitHub
commit 4aa1bf6d1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions

View file

@ -0,0 +1,4 @@
import ./common.nix {
version = "2.2.9";
sha256 = "sha256-fr69bSAj//cHewNy+hFx+IBSm97GEE8gmDKXwv63wXI=";
}

View file

@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
url = "https://github.com/sbcl/sbcl/commit/8fa3f76fba2e8572e86ac6fc5754e6b2954fc774.patch";
sha256 = "1ic531pjnws1k3xd03a5ixbq8cn10dlh2nfln59k0vbm0253g3lv";
})
++ lib.optionals (lib.versionAtLeast version "2.1.10") [
# Fix pending upstream inclusion on -fno-common toolchains:
++ lib.optionals (lib.versionAtLeast version "2.1.10" && lib.versionOlder version "2.2.9") [
# Fix included in SBCL trunk since 2.2.9:
# https://bugs.launchpad.net/sbcl/+bug/1980570
(fetchpatch {
name = "darwin-fno-common.patch";

View file

@ -14883,7 +14883,8 @@ with pkgs;
sbcl_2_1_11 = callPackage ../development/compilers/sbcl/2.1.11.nix {};
sbcl_2_2_4 = callPackage ../development/compilers/sbcl/2.2.4.nix {};
sbcl_2_2_6 = callPackage ../development/compilers/sbcl/2.2.6.nix {};
sbcl = sbcl_2_2_6;
sbcl_2_2_9 = callPackage ../development/compilers/sbcl/2.2.9.nix {};
sbcl = sbcl_2_2_9;
roswell = callPackage ../development/tools/roswell { };