cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #179949 from marsam/update-sbcl

Browse source 
sbcl: 2.2.4 -> 2.2.6
This commit is contained in:
7c6f434c 2022-07-06 20:59:41 +00:00 committed by GitHub
commit 0cd1b87d0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/sbcl/2.2.6.nix Normal file
View file

@ -0,0 +1,4 @@
import ./common.nix {
version = "2.2.6";
sha256 = "sha256-PiMEjI+oJvuRMiC+sqw2l9vFwM3y6J/tjbOe0XEjBKA=";
}

15
pkgs/development/compilers/sbcl/common.nix
View file

@ -1,6 +1,6 @@
{ version, sha256 }: { version, sha256 }:
{ lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap { lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap, zstd
, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
, threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system) , threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system)
, linkableRuntime ? stdenv.hostPlatform.isx86 , linkableRuntime ? stdenv.hostPlatform.isx86
@ -9,6 +9,7 @@
# Note that the created binaries still need `patchelf --set-interpreter ...` # Note that the created binaries still need `patchelf --set-interpreter ...`
# to get rid of ${glibc} dependency. # to get rid of ${glibc} dependency.
, purgeNixReferences ? false , purgeNixReferences ? false
, coreCompression ? lib.versionAtLeast version "2.2.6"
, texinfo , texinfo
}: }:
@ -21,7 +22,8 @@ stdenv.mkDerivation rec {
inherit sha256; inherit sha256;
}; };
buildInputs = [texinfo]; nativeBuildInputs = [ texinfo ];
buildInputs = lib.optionals coreCompression [ zstd ];
patches = lib.optional patches = lib.optional
(lib.versionAtLeast version "2.1.2" && lib.versionOlder version "2.1.8") (lib.versionAtLeast version "2.1.2" && lib.versionOlder version "2.1.8")
@ -38,6 +40,14 @@ stdenv.mkDerivation rec {
url = "https://bugs.launchpad.net/sbcl/+bug/1980570/+attachment/5600916/+files/0001-src-runtime-fix-fno-common-build-on-darwin.patch"; url = "https://bugs.launchpad.net/sbcl/+bug/1980570/+attachment/5600916/+files/0001-src-runtime-fix-fno-common-build-on-darwin.patch";
sha256 = "0avpwgjdaxxdpq8pfvv9darfn4ql5dgqq7zaf3nmxnvhh86ngzij"; sha256 = "0avpwgjdaxxdpq8pfvv9darfn4ql5dgqq7zaf3nmxnvhh86ngzij";
}) })
] ++ lib.optionals (version == "2.2.6") [
# Take contrib blocklist into account for doc generation. This fixes sbcl
# build on aarch64, because the docs Makefile tries to require sb-simd,
# which is blocked in that platform.
(fetchpatch {
url = "https://github.com/sbcl/sbcl/commit/f88989694200a5192fb68047d43d0500b2165f7b.patch";
sha256 = "sha256-MXEsK46RARPmB2WBPcrmZk6ArliU8DgHw73x9+/QAmk=";
})
]; ];
postPatch = '' postPatch = ''
@ -85,6 +95,7 @@ stdenv.mkDerivation rec {
enableFeatures = with lib; enableFeatures = with lib;
optional threadSupport "sb-thread" ++ optional threadSupport "sb-thread" ++
optional linkableRuntime "sb-linkable-runtime" ++ optional linkableRuntime "sb-linkable-runtime" ++
optional coreCompression "sb-core-compression" ++
optional stdenv.isAarch32 "arm"; optional stdenv.isAarch32 "arm";
disableFeatures = with lib; disableFeatures = with lib;

3
pkgs/top-level/all-packages.nix
View file

@ -14185,7 +14185,8 @@ with pkgs;
sbcl_2_1_10 = callPackage ../development/compilers/sbcl/2.1.10.nix {}; sbcl_2_1_10 = callPackage ../development/compilers/sbcl/2.1.10.nix {};
sbcl_2_1_11 = callPackage ../development/compilers/sbcl/2.1.11.nix {}; 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_4 = callPackage ../development/compilers/sbcl/2.2.4.nix {};
sbcl = sbcl_2_2_4; sbcl_2_2_6 = callPackage ../development/compilers/sbcl/2.2.6.nix {};
sbcl = sbcl_2_2_6;
roswell = callPackage ../development/tools/roswell { }; roswell = callPackage ../development/tools/roswell { };