nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

sbcl: update to 2.1.2 and add arm64-darwin

(cherry picked from commit 49d2ad093ecd54f40550745f240dda8dbf0ce920)

authored by

Finn Behrens and committed by
Andrew Childs
417a96c8 1f0ae937

+9 -4
+2 -2
pkgs/development/compilers/sbcl/2.0.8.nix
··· 1 1 import ./common.nix { 2 - version = "2.0.8"; 3 - sha256 = "1xwrwvps7drrpyw3wg5h3g2qajmkwqs9gz0fdw1ns9adp7vld390"; 2 + version = "2.1.2"; 3 + sha256 = "sha256-t3EFUJOYVe1JWYxKAUSD7RILaZFliio7avpHcT3OTAs="; 4 4 }
+5
pkgs/development/compilers/sbcl/bootstrap.nix
··· 2 2 3 3 let 4 4 options = rec { 5 + aarch64-darwin = { 6 + version = "2.1.2"; 7 + system = "arm64-darwin"; 8 + sha256 = "sha256-H0ALigXcWIypdA+fTf7jERscwbb7QIAfcoxCtGDh0RU="; 9 + }; 5 10 x86_64-darwin = { 6 11 version = "1.2.11"; 7 12 system = "x86-64-darwin";
+2 -2
pkgs/development/compilers/sbcl/common.nix
··· 2 2 3 3 { lib, stdenv, fetchurl, writeText, sbclBootstrap 4 4 , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" 5 - , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system) 5 + , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system) 6 6 , disableImmobileSpace ? false 7 7 # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. 8 8 # Note that the created binaries still need `patchelf --set-interpreter ...` ··· 79 79 lib.concatStringsSep " " 80 80 (builtins.map (x: "--with-${x}") enableFeatures ++ 81 81 builtins.map (x: "--without-${x}") disableFeatures) 82 - } 82 + } ${if stdenv.hostPlatform.system == "aarch64-darwin" then "--arch=arm64" else ""} 83 83 (cd doc/manual ; make info) 84 84 85 85 runHook postBuild