Unverified Commit 7cd98160 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #292348 from hraban/sbcl-2.4.2 

sbcl: 2.4.1 -> 2.4.2
parents 3e1d4fc6 c3f3caa6

pkgs/development/compilers/sbcl/default.nix

+5 −6
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ let 
      sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y";

    };



    "2.4.0" = {

      sha256 = "sha256-g9i3TwjSJUxZuXkLwfZp4JCZRXuIRyDs7L9F9LRtF3Y=";

    };

    "2.4.1" = {

      sha256 = "sha256-2k+UhvrUE9OversbCSaTJf20v/fnuI8hld3udDJjz34=";

    };

    "2.4.2" = {

      sha256 = "sha256-/APLUtEqr+h1nmMoRQogG73fibFwcaToPznoC0Pd7w8=";

    };

  };

  # Collection of pre-built SBCL binaries for platforms that need them for

  # bootstrapping. Ideally these are to be avoided.  If CLISP (or any other
@@ -96,10 +96,9 @@ stdenv.mkDerivation (self: rec { 
  );

  buildInputs = lib.optionals coreCompression [ zstd ];



  patches = [

  patches = lib.optionals (lib.versionOlder self.version "2.4.2") [

    # Fixed in 2.4.2

    ./search-for-binaries-in-PATH.patch

  ] ++ lib.optionals (version == "2.4.0") [

    ./fix-2.4.0-aarch64-darwin.patch

  ];



  # I don’t know why these are failing (on ofBorg), and I’d rather just disable

pkgs/top-level/all-packages.nix

+5 −5
Original line number Diff line number Diff line
@@ -25788,17 +25788,17 @@ with pkgs; 
  };















  # Steel Bank Common Lisp













  sbcl_2_4_0 = wrapLisp {













    pkg = callPackage ../development/compilers/sbcl { version = "2.4.0"; };













  sbcl_2_4_1 = wrapLisp {













    pkg = callPackage ../development/compilers/sbcl { version = "2.4.1"; };















    faslExt = "fasl";















    flags = [ "--dynamic-space-size" "3000" ];















  };













  sbcl_2_4_1 = wrapLisp {













    pkg = callPackage ../development/compilers/sbcl { version = "2.4.1"; };













  sbcl_2_4_2 = wrapLisp {













    pkg = callPackage ../development/compilers/sbcl { version = "2.4.2"; };















    faslExt = "fasl";















    flags = [ "--dynamic-space-size" "3000" ];















  };













  sbcl = sbcl_2_4_1;













  sbcl = sbcl_2_4_2;





























  sbclPackages = recurseIntoAttrs sbcl.pkgs;