public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sbcl: update to 2.1.2 and add arm64-darwin

Browse Source 
(cherry picked from commit 49d2ad093ecd54f40550745f240dda8dbf0ce920)
This commit is contained in:
Finn Behrens 2021-03-14 17:51:57 +01:00 committed by Andrew Childs
parent 1f0ae937d6
commit 417a96c8be
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/sbcl/2.0.8.nix
View File

@ -1,4 +1,4 @@
import ./common.nix { import ./common.nix {
version = "2.0.8"; version = "2.1.2";
sha256 = "1xwrwvps7drrpyw3wg5h3g2qajmkwqs9gz0fdw1ns9adp7vld390"; sha256 = "sha256-t3EFUJOYVe1JWYxKAUSD7RILaZFliio7avpHcT3OTAs=";
} }

5
pkgs/development/compilers/sbcl/bootstrap.nix
View File

@ -2,6 +2,11 @@
let let
options = rec { options = rec {
aarch64-darwin = {
version = "2.1.2";
system = "arm64-darwin";
sha256 = "sha256-H0ALigXcWIypdA+fTf7jERscwbb7QIAfcoxCtGDh0RU=";
};
x86_64-darwin = { x86_64-darwin = {
version = "1.2.11"; version = "1.2.11";
system = "x86-64-darwin"; system = "x86-64-darwin";

4
pkgs/development/compilers/sbcl/common.nix
View File

@ -2,7 +2,7 @@
{ lib, stdenv, fetchurl, writeText, sbclBootstrap { lib, stdenv, fetchurl, writeText, sbclBootstrap
, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system) , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system)
, disableImmobileSpace ? false , disableImmobileSpace ? false
# Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
# Note that the created binaries still need `patchelf --set-interpreter ...` # Note that the created binaries still need `patchelf --set-interpreter ...`
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
lib.concatStringsSep " " lib.concatStringsSep " "
(builtins.map (x: "--with-${x}") enableFeatures ++ (builtins.map (x: "--with-${x}") enableFeatures ++
builtins.map (x: "--without-${x}") disableFeatures) builtins.map (x: "--without-${x}") disableFeatures)
} } ${if stdenv.hostPlatform.system == "aarch64-darwin" then "--arch=arm64" else ""}
(cd doc/manual ; make info) (cd doc/manual ; make info)
runHook postBuild runHook postBuild