aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/compilers/sbcl
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2020-10-24 12:51:26 +0200
committerMichael Raskin <7c6f434c@mail.ru>2020-10-24 12:52:16 +0200
commit571d45fea6b05739eda76bdce9ffb30d2f7c6d8a (patch)
tree951acd20f46d78d75db2c522ae54052cdbf8526e /pkgs/development/compilers/sbcl
parent1ced8347aa87d3371520b220383938164deb7000 (diff)
sbcl: 2.0.0 -> 2.0.8
Diffstat (limited to 'pkgs/development/compilers/sbcl')
-rw-r--r--pkgs/development/compilers/sbcl/2.0.0.nix114
-rw-r--r--pkgs/development/compilers/sbcl/default.nix4
2 files changed, 2 insertions, 116 deletions
diff --git a/pkgs/development/compilers/sbcl/2.0.0.nix b/pkgs/development/compilers/sbcl/2.0.0.nix
deleted file mode 100644
index 6df98a9a60ea..000000000000
--- a/pkgs/development/compilers/sbcl/2.0.0.nix
+++ /dev/null
@@ -1,114 +0,0 @@
-{ stdenv, fetchurl, writeText, sbclBootstrap
-, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
-, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system)
-, disableImmobileSpace ? false
- # 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 ...`
- # to get rid of ${glibc} dependency.
-, purgeNixReferences ? false
-, texinfo
-}:
-
-stdenv.mkDerivation rec {
- pname = "sbcl";
- version = "2.0.0";
-
- src = fetchurl {
- url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2";
- sha256 = "1krgd69cirp4ili2pfsh1a0mfvq722jbknlvmf17qhsxh1b94dlh";
- };
-
- buildInputs = [texinfo];
-
- patchPhase = ''
- echo '"${version}.nixos"' > version.lisp-expr
-
- pwd
-
- # SBCL checks whether files are up-to-date in many places..
- # Unfortunately, same timestamp is not good enough
- sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
- #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
- sed -i src/cold/slam.lisp -e \
- '/file-write-date input/a)'
- sed -i src/cold/slam.lisp -e \
- '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))'
- sed -i src/code/target-load.lisp -e \
- '/date defaulted-fasl/a)'
- sed -i src/code/target-load.lisp -e \
- '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
-
- # Fix the tests
- sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
- sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
-
- # Use whatever `cc` the stdenv provides
- substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
-
- substituteInPlace src/runtime/Config.x86-64-darwin \
- --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5
- ''
- + (if purgeNixReferences
- then
- # This is the default location to look for the core; by default in $out/lib/sbcl
- ''
- sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \
- -i src/runtime/runtime.c
- ''
- else
- # Fix software version retrieval
- ''
- sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \
- src/code/run-program.lisp
- ''
- );
-
-
- preBuild = ''
- export INSTALL_ROOT=$out
- mkdir -p test-home
- export HOME=$PWD/test-home
- '';
-
- enableFeatures = with stdenv.lib;
- optional threadSupport "sb-thread" ++
- optional stdenv.isAarch32 "arm";
-
- disableFeatures = with stdenv.lib;
- optional (!threadSupport) "sb-thread" ++
- optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ];
-
- buildPhase = ''
- sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${
- stdenv.lib.concatStringsSep " "
- (builtins.map (x: "--with-${x}") enableFeatures ++
- builtins.map (x: "--without-${x}") disableFeatures)
- }
- (cd doc/manual ; make info)
- '';
-
- installPhase = ''
- INSTALL_ROOT=$out sh install.sh
- ''
- + stdenv.lib.optionalString (!purgeNixReferences) ''
- cp -r src $out/lib/sbcl
- cp -r contrib $out/lib/sbcl
- cat >$out/lib/sbcl/sbclrc <<EOF
- (setf (logical-pathname-translations "SYS")
- '(("SYS:SRC;**;*.*.*" #P"$out/lib/sbcl/src/**/*.*")
- ("SYS:CONTRIB;**;*.*.*" #P"$out/lib/sbcl/contrib/**/*.*")))
- EOF
- '';
-
- setupHook = stdenv.lib.optional purgeNixReferences (writeText "setupHook.sh" ''
- addEnvHooks "$targetOffset" _setSbclHome
- _setSbclHome() {
- export SBCL_HOME='@out@/lib/sbcl/'
- }
- '');
-
- meta = sbclBootstrap.meta // {
- inherit version;
- updateWalker = true;
- };
-}
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index d4a00f57b6a4..3c7fca3c4b03 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "sbcl";
- version = "2.0.2";
+ version = "2.0.8";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2";
- sha256 = "07pyzdjnhcpqwvr3rrk4i18maqdywbq1qj93fnpx1h4b7dp08r28";
+ sha256 = "sha256:1xwrwvps7drrpyw3wg5h3g2qajmkwqs9gz0fdw1ns9adp7vld390";
};
buildInputs = [texinfo];