Updating CLisp and adding SBCL. SBCL currently has to be symlinked to a writable directory (I am investigating a fix). CLisp 2.47 is somewhat incompatible with lots of software, so I added 2.44.1 as preserved version

svn path=/nixpkgs/trunk/; revision=15806

2 files changed, 53 insertions, 5 deletions

diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix
new file mode 100644
index 000000000000..9ce38a6ed485
--- /dev/null
+++ b/pkgs/development/interpreters/clisp/2.44.1.nix
@@ -0,0 +1,44 @@
+args: with args;
+stdenv.mkDerivation rec {
+  v = "2.44.1";
+  name = "clisp-${v}";
+  src =
+	fetchurl {
+		url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
+		sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1";
+	};
+
+  inherit libsigsegv gettext coreutils;
+  buildInputs = [libsigsegv gettext ncurses readline libX11 libXau
+	libXt pcre zlib libXpm xproto libXext xextproto libffi
+	libffcall];
+ 
+  # First, replace port 9090 (rather low, can be used)
+  # with 64237 (much higher, IANA private area, not
+  # anything rememberable).
+  patchPhase = ''
+  sed -e 's@9090@64237@g' -i tests/socket.tst
+  sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
+  find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
+  '';
+
+  configureFlags = "--with-readline builddir --with-dynamic-ffi
+  --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
+  --with-module=pcre --with-module=rawsock --with-module=readline
+  --with-module=syscalls --with-module=wildcard --with-module=zlib";
+
+  preBuild = ''
+    sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
+    cd builddir
+  '';
+
+  NIX_CFLAGS_COMPILE="-O0";
+
+  # TODO : make mod-check fails
+  doCheck = 1;
+
+  meta = {
+	  description = "ANSI Common Lisp Implementation";
+	  homepage = http://clisp.cons.org;
+  };
+}
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index c20ba9b128f9..bd074138c4a8 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -1,16 +1,17 @@
 args: with args;
 stdenv.mkDerivation rec {
-  v = "2.43";
+  v = "2.47";
   name = "clisp-${v}";
   src =
 	fetchurl {
-		url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2";
-		sha256 = "10qyn6wccnayf1cyvrcanay6c6laar6z1r608w7ijp6nb763q8dm";
+		url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
+		sha256 = "0slfx519pk75y5rf7wfna7jgyhkr4qp29z9zd1rcnnrhps11bpn7";
 	};
 
   inherit libsigsegv gettext coreutils;
   buildInputs = [libsigsegv gettext ncurses readline libX11 libXau
-	libXt pcre zlib libXpm xproto libXext xextproto];
+	libXt pcre zlib libXpm xproto libXext xextproto libffi
+	libffcall];
  
   # First, replace port 9090 (rather low, can be used)
   # with 64237 (much higher, IANA private area, not
@@ -26,7 +27,10 @@ stdenv.mkDerivation rec {
   --with-module=pcre --with-module=rawsock --with-module=readline
   --with-module=syscalls --with-module=wildcard --with-module=zlib";
 
-  preBuild = "cd builddir";
+  preBuild = ''
+    sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
+    cd builddir
+  '';
 
   NIX_CFLAGS_COMPILE="-O0";