From a60e49c31804469a626c179f58f09c5209cef561 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Sun, 21 Oct 2018 01:15:07 +0200 Subject: [PATCH 1/3] sbcl: 1.4.10 -> 1.4.12 --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 34855838fe8..cddaed3764b 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.10"; + version = "1.4.12"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1j9wb608pkihpwgzl4qvnr4jl6mb7ngfqy559pxnvmnn1zlyfklh"; + sha256 = "0maa4h5zdykq050hdqk5wd74dhl6k7br3qrhfd4f2387skk8ky7a"; }; patchPhase = '' From d1a9baaef3bcbcf3892b5fa54055ae4f81e675bf Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Sun, 21 Oct 2018 01:16:35 +0200 Subject: [PATCH 2/3] sbcl: include sources --- pkgs/development/compilers/sbcl/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index cddaed3764b..9cb6d58be16 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -87,6 +87,15 @@ stdenv.mkDerivation rec { 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 < Date: Sun, 21 Oct 2018 01:19:34 +0200 Subject: [PATCH 3/3] sbcl: specify $SBCL_HOME only when necessary --- pkgs/development/compilers/sbcl/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 9cb6d58be16..334ecbb168b 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -98,13 +98,12 @@ stdenv.mkDerivation rec { EOF ''; - # Specifying $SBCL_HOME is only truly needed with `purgeNixReferences = true`. - setupHook = writeText "setupHook.sh" '' + setupHook = stdenv.lib.optional purgeNixReferences (writeText "setupHook.sh" '' addEnvHooks "$targetOffset" _setSbclHome _setSbclHome() { export SBCL_HOME='@out@/lib/sbcl/' } - ''; + ''); meta = sbclBootstrap.meta // { inherit version;