From 08abe4fe936f5700900e9e009ead7d703ea76d5f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 10 Apr 2017 09:57:07 +0200 Subject: [PATCH] lispPackage.iolib: list the hidden systems to make sure bundles exist --- .../lisp-modules/quicklisp-to-nix-overrides.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index ea7e790ccae..e17db11a553 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -2,7 +2,7 @@ let addDeps = newdeps: x: {deps = x.deps ++ newdeps;}; addNativeLibs = libs: x: { propagatedBuildInputs = libs; }; - skipBuildPhase = x: { + skipBuildPhase = x: { overrides = y: ((x.overrides y) // { buildPhase = "true"; }); }; qlnp = quicklisp-to-nix-packages; @@ -33,8 +33,13 @@ in }; hunchentoot = addNativeLibs [pkgs.openssl]; iolib = x: { - propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ [pkgs.libfixposix pkgs.gcc]; - testSystems = (x.testSystems or ["iolib"]) ++ ["iolib/os" "iolib/zstreams"]; + propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ + [pkgs.libfixposix pkgs.gcc]; + testSystems = (x.testSystems or ["iolib"]) ++ [ + "iolib/os" "iolib/zstreams" "iolib/common-lisp" "iolib/base" "iolib/asdf" + "iolib/conf" "iolib/grovel" "iolib/syscalls" "iolib/sockets" + "iolib/multiplex" "iolib/streams" + ]; }; cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]); clack = addDeps (with qlnp;[lack bordeaux-threads prove]); @@ -51,7 +56,7 @@ in 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 - ])) + ])) (addNativeLibs (with pkgs; [libuv openssl]))]; woo = addDeps (with qlnp; [ cffi lev clack swap-bytes static-vectors fast-http proc-parse quri fast-io