quicklispPackages: update to fresh QuickLisp

lispPackages: reduce environment-bombing
This commit is contained in:
Michael Raskin
2017-04-06 18:47:36 +02:00
parent 09b1414acd
commit 365e8a7b6a
162 changed files with 1396 additions and 725 deletions
@@ -10,15 +10,25 @@ let
((builtins.head l) x) // (multiOverride (builtins.tail l) x);
in
{
stumpwm = addDeps (with qlnp; [alexandria cl-ppcre clx]);
stumpwm = x:{
overrides = y: (x.overrides y) // {
preConfigure = ''
export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh";
'';
};
};
iterate = skipBuildPhase;
cl-fuse = x: {
propagatedBuildInputs = [pkgs.fuse];
overrides = y : (x.overrides y) // {
configurePhase = ''
export SAVED_CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY"
export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD"
export makeFlags="$makeFlags LISP=common-lisp.sh"
'';
preInstall = ''
export CL_SOURCE_REGISTRY="$SAVED_CL_SOURCE_REGISTRY"
'';
};
};
hunchentoot = addNativeLibs [pkgs.openssl];
@@ -31,13 +41,10 @@ in
flexi-streams circular-streams ironclad cl-syntax-annot alexandria
split-sequence
]);
clack-handler-fcgi = addDeps (with qlnp; []);
lack = addDeps (with qlnp; [ironclad]);
cxml = skipBuildPhase;
cxml-xml = skipBuildPhase;
cxml-dom = skipBuildPhase;
cxml-klacks = skipBuildPhase;
cxml-test = skipBuildPhase;
cxml = multiOverride [ skipBuildPhase (addDeps (with qlnp; [
closure-common puri trivial-gray-streams
]))];
wookie = multiOverride [(addDeps (with qlnp; [
alexandria blackbird cl-async chunga fast-http quri babel cl-ppcre
cl-fad fast-io vom do-urlencode cl-async-ssl
@@ -92,18 +99,10 @@ in
'';
};
};
cffi-grovel = addDeps (with qlnp; [ cffi-toolchain ]);
cffi-toolchain = addDeps (with qlnp; [ cffi uiop ]);
cffi-examples = addDeps (with qlnp; [ cffi ]);
cffi-libffi = addDeps (with qlnp; [ cffi ]);
cffi-uffi-compat = addDeps (with qlnp; [ cffi ]);
cffi = multiOverride [(addNativeLibs [pkgs.libffi])
(addDeps (with qlnp; [uffi]))];
(addDeps (with qlnp; [uffi uiop trivial-features]))];
cl-vectors = addDeps (with qlnp; [zpb-ttf]);
"3bmd" = addDeps (with qlnp; [esrap split-sequence]);
"3bmd-ext-tables" = addDeps (with qlnp; [qlnp."3bmd"]);
"3bmd-ext-wiki-links" = addDeps (with qlnp; [qlnp."3bmd"]);
"3bmd-youtube" = addDeps (with qlnp; [qlnp."3bmd"]);
cl-dbi = addDeps (with qlnp; [
cl-syntax cl-syntax-annot split-sequence closer-mop bordeaux-threads
]);
@@ -126,4 +125,11 @@ in
babel-streams = addDeps (with qlnp; [babel]);
plump = addDeps (with qlnp; [array-utils trivial-indent]);
sqlite = addNativeLibs [pkgs.sqlite];
uiop = x: {
overrides = y: (x.overrides y) // {
postInstall = ((x.overrides y).postInstall or "") + ''
cp -r "${pkgs.asdf}/lib/common-lisp/asdf/uiop/contrib" "$out/lib/common-lisp/uiop"
'';
};
};
}