BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #31617 from orivej/clisp

Browse source 
clisp_2_44_1, libsigsegv_25: delete
This commit is contained in:
Michael Raskin 2017-11-14 09:42:20 +01:00 committed by GitHub
commit eac38d0b1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
pkgs/development/interpreters/clisp/2.33.2.nix
View file

@ -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";
};
}

60
pkgs/development/interpreters/clisp/2.44.1.nix
View file

@ -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";
};
}

23
pkgs/development/libraries/libsigsegv/2.5.nix
View file

@ -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;
}

10
pkgs/top-level/all-packages.nix
View file

@ -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;
};