clisp_2_44_1, libsigsegv_25: delete

4 files changed, 0 insertions, 159 deletions

diff --git a/pkgs/development/interpreters/clisp/2.33.2.nix b/pkgs/development/interpreters/clisp/2.33.2.nix
deleted file mode 100644
index 18b325684ca5c..0000000000000
--- a/pkgs/development/interpreters/clisp/2.33.2.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
-, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
-, libffi, libffcall, coreutils, automake, autoconf, linuxHeaders
-, groff
-}:
-        
-stdenv.mkDerivation rec {
-  version = "2.33.2";
-  name = "clisp-${version}";
-  
-  src = fetchurl {
-    url = "mirror://gnu/clisp/release/${version}/${name}.tar.gz";
-    sha256 = "0rqyggviixaa68n5ll092ll4a2xy4y7jraq65l0gn0hkjhjnm5zh";
-  };
-
-  buildInputs =
-    [ libsigsegv gettext ncurses readline libX11 libXau libXt pcre
-      zlib libXpm xproto libXext xextproto libffi libffcall 
-      automake autoconf groff
-    ]
-    ++ (stdenv.lib.optional stdenv.isLinux linuxHeaders)
-    ;
-
-  # First, replace port 9090 (rather low, can be used)
-  # with 64237 (much higher, IANA private area, not
-  # anything rememberable).
-  # Also remove reference to a type that disappeared from recent glibc
-  # (seems the correct thing to do, found no reference to any solution)
-  postPatch = ''
-    sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
-    find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
-
-    substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" ""
-  '';
-  
-  configureFlags =
-    ''
-      builddir
-      --with-readline --with-ffcall --with-dynamic-ffi
-      --with-module=readline --with-module=i18n --with-module=pcre
-      --with-module=syscalls --with-modules=zlib --with-module=curses
-    '';
-
-  preBuild = ''
-    echo Pre-build starting!
-    sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
-    sed -e '/asm\/page.h/d' -i src/unix.d
-    cd builddir
-    ./makemake $configureFlags > Makefile
-    make config.lisp
-    cat config.lisp
-  '';
-
-  NIX_CFLAGS_COMPILE="-O0 -lreadline -lncursesw";
-
-  # TODO : make mod-check fails
-  doCheck = false;
-
-  meta = {
-    description = "ANSI Common Lisp Implementation";
-    homepage = http://clisp.cons.org;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-    branch = "2.44";
-  };
-}
diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix
deleted file mode 100644
index b7b329ea9560b..0000000000000
--- a/pkgs/development/interpreters/clisp/2.44.1.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
-, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
-, libffi, libffcall, coreutils }:
-
-stdenv.mkDerivation rec {
-  v = "2.44.1";
-  name = "clisp-${v}";
-
-  src = fetchurl {
-    url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
-    sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1";
-  };
-
-  buildInputs =
-    [ libsigsegv gettext ncurses readline libX11 libXau libXt pcre
-      zlib libXpm xproto libXext xextproto libffi libffcall ];
-
-  patches = [ ./bits_ipctypes_to_sys_ipc.patch ]; # from Gentoo
-
-  # First, replace port 9090 (rather low, can be used)
-  # with 64237 (much higher, IANA private area, not
-  # anything rememberable).
-  # Also remove reference to a type that disappeared from recent glibc
-  # (seems the correct thing to do, found no reference to any solution)
-  postPatch = ''
-    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
-
-    substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" ""
-  '';
-
-  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 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
-
-  hardeningDisable = [ "format" ];
-
-  # TODO : make mod-check fails
-  doCheck = false;
-
-  meta = {
-    description = "ANSI Common Lisp Implementation";
-    homepage = http://clisp.cons.org;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-    branch = "2.44";
-  };
-}
diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix
deleted file mode 100644
index fd453defe7135..0000000000000
--- a/pkgs/development/libraries/libsigsegv/2.5.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl
-, enableSigbusFix ? false # required by kernels < 3.18.6
-}:
-
-stdenv.mkDerivation rec {
-  name = "libsigsegv-2.5";
-
-  src = fetchurl {
-    url = "mirror://gnu/libsigsegv/${name}.tar.gz";
-    sha256 = "0fvcsq9msi63vrbpvks6mqkrnls5cfy6bzww063sqhk2h49vsyyg";
-  };
-
-  patches = stdenv.lib.optional enableSigbusFix ./sigbus_fix.patch;
-
-  meta = {
-    homepage = http://libsigsegv.sf.net;
-    description = "A library for handling page faults in user mode";
-    branch = "2.5";
-    platforms = stdenv.lib.platforms.linux;
-  };
-
-  doCheck = true;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc32e283143af..5343f1c7807dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6396,13 +6396,6 @@ with pkgs;
   clisp = callPackage ../development/interpreters/clisp { };
   clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { };
 
-  # compatibility issues in 2.47 - at list 2.44.1 is known good
-  # for sbcl bootstrap.
-  # SBCL page recommends 2.33.2, though. Not sure when was it last tested
-  clisp_2_44_1 = callPackage ../development/interpreters/clisp/2.44.1.nix {
-    libsigsegv = libsigsegv_25;
-  };
-
   clojure = callPackage ../development/interpreters/clojure { };
 
   clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
@@ -9556,9 +9549,6 @@ with pkgs;
 
   libsigsegv = callPackage ../development/libraries/libsigsegv { };
 
-  # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5
-  libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { };
-
   libsndfile = callPackage ../development/libraries/libsndfile {
     inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox;
   };