From bc47794ab580a28d9c995e4b0f01ef4bee77af28 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 21 Jun 2017 22:15:07 +0200
Subject: [PATCH] quicklispPackages: update

Escape things by default in derivation names (i.e. digit cannot be the
first character etc.)

Update Quicklisp (tracking upstream); list new missing dependencies

Add some minimal README about ql-to-nix
---
 pkgs/development/lisp-modules/README.txt      |  16 +
 .../lisp-modules/define-package.nix           |   3 +-
 .../{3bmd.nix => _3bmd.nix}                   |   9 +-
 .../quicklisp-to-nix-output/abnf.nix          |  35 ++
 .../quicklisp-to-nix-output/alexandria.nix    |  14 +-
 .../quicklisp-to-nix-output/anaphora.nix      |   2 +
 .../quicklisp-to-nix-output/array-utils.nix   |  14 +-
 .../asdf-system-connections.nix               |  36 ++
 .../quicklisp-to-nix-output/babel-streams.nix |  17 +-
 .../quicklisp-to-nix-output/babel.nix         |  16 +-
 .../quicklisp-to-nix-output/blackbird.nix     |   4 +-
 .../bordeaux-threads.nix                      |   6 +-
 .../quicklisp-to-nix-output/caveman.nix       |   7 +-
 .../quicklisp-to-nix-output/cffi-grovel.nix   |   5 +-
 .../quicklisp-to-nix-output/cffi.nix          |   5 +-
 .../quicklisp-to-nix-output/chipz.nix         |   2 +
 .../quicklisp-to-nix-output/chunga.nix        |   4 +-
 .../circular-streams.nix                      |   6 +-
 .../quicklisp-to-nix-output/cl+ssl.nix        |   8 +-
 .../quicklisp-to-nix-output/cl-aa.nix         |  14 +-
 .../quicklisp-to-nix-output/cl-annot.nix      |   4 +-
 .../quicklisp-to-nix-output/cl-anonfun.nix    |   2 +
 .../quicklisp-to-nix-output/cl-ansi-text.nix  |   5 +-
 .../quicklisp-to-nix-output/cl-async-base.nix |   6 +-
 .../quicklisp-to-nix-output/cl-async-repl.nix |   4 +-
 .../quicklisp-to-nix-output/cl-async-ssl.nix  |   5 +-
 .../quicklisp-to-nix-output/cl-async-util.nix |   8 +-
 .../quicklisp-to-nix-output/cl-async.nix      |   7 +-
 .../quicklisp-to-nix-output/cl-base64.nix     |   2 +
 .../quicklisp-to-nix-output/cl-colors.nix     |   5 +-
 .../quicklisp-to-nix-output/cl-containers.nix |  36 ++
 .../quicklisp-to-nix-output/cl-cookie.nix     |   8 +-
 .../quicklisp-to-nix-output/cl-csv.nix        |  36 ++
 .../quicklisp-to-nix-output/cl-dbi.nix        |   2 +
 .../quicklisp-to-nix-output/cl-emb.nix        |   2 +
 .../quicklisp-to-nix-output/cl-fad.nix        |   5 +-
 .../cl-fuse-meta-fs.nix                       |   7 +-
 .../quicklisp-to-nix-output/cl-fuse.nix       |   7 +-
 .../quicklisp-to-nix-output/cl-interpol.nix   |  35 ++
 .../quicklisp-to-nix-output/cl-json.nix       |   2 +
 .../quicklisp-to-nix-output/cl-l10n-cldr.nix  |   2 +
 .../quicklisp-to-nix-output/cl-l10n.nix       |   7 +-
 .../quicklisp-to-nix-output/cl-libuv.nix      |   5 +-
 .../quicklisp-to-nix-output/cl-log.nix        |  35 ++
 .../quicklisp-to-nix-output/cl-markdown.nix   |  39 ++
 .../quicklisp-to-nix-output/cl-markup.nix     |   2 +
 .../quicklisp-to-nix-output/cl-mysql.nix      |   4 +-
 .../quicklisp-to-nix-output/cl-paths-ttf.nix  |  16 +-
 .../quicklisp-to-nix-output/cl-postgres.nix   |   4 +-
 .../cl-ppcre-template.nix                     |  16 +-
 .../cl-ppcre-unicode.nix                      |   4 +-
 .../quicklisp-to-nix-output/cl-ppcre.nix      |   2 +
 .../quicklisp-to-nix-output/cl-project.nix    |   8 +-
 .../quicklisp-to-nix-output/cl-reexport.nix   |   4 +-
 .../quicklisp-to-nix-output/cl-smtp.nix       |   8 +-
 .../quicklisp-to-nix-output/cl-store.nix      |   2 +
 .../cl-syntax-annot.nix                       |   4 +-
 .../cl-syntax-anonfun.nix                     |   4 +-
 .../cl-syntax-markup.nix                      |   4 +-
 .../quicklisp-to-nix-output/cl-syntax.nix     |   5 +-
 .../quicklisp-to-nix-output/cl-test-more.nix  |   2 +
 .../quicklisp-to-nix-output/cl-unicode.nix    |   2 +
 .../cl-unification.nix                        |  12 +-
 .../quicklisp-to-nix-output/cl-utilities.nix  |   2 +
 .../quicklisp-to-nix-output/cl-vectors.nix    |  14 +-
 .../quicklisp-to-nix-output/cl-who.nix        |   2 +
 .../clack-v1-compat.nix                       |  23 +-
 .../quicklisp-to-nix-output/clack.nix         |  17 +-
 .../quicklisp-to-nix-output/closer-mop.nix    |  12 +-
 .../closure-common.nix                        |   6 +-
 .../quicklisp-to-nix-output/clsql.nix         |   4 +-
 .../quicklisp-to-nix-output/clss.nix          |  16 +-
 .../quicklisp-to-nix-output/clx-truetype.nix  |   7 +-
 .../quicklisp-to-nix-output/clx.nix           |  14 +-
 .../command-line-arguments.nix                |   2 +
 .../quicklisp-to-nix-output/css-lite.nix      |   2 +
 .../quicklisp-to-nix-output/cxml-dom.nix      |   4 +-
 .../quicklisp-to-nix-output/cxml-klacks.nix   |   4 +-
 .../quicklisp-to-nix-output/cxml-test.nix     |   5 +-
 .../quicklisp-to-nix-output/cxml-xml.nix      |   6 +-
 .../quicklisp-to-nix-output/cxml.nix          |   5 +-
 .../quicklisp-to-nix-output/db3.nix           |  35 ++
 .../quicklisp-to-nix-output/dbd-mysql.nix     |   6 +-
 .../quicklisp-to-nix-output/dbd-postgres.nix  |   8 +-
 .../quicklisp-to-nix-output/dbd-sqlite3.nix   |   7 +-
 .../quicklisp-to-nix-output/dexador.nix       |  22 +-
 .../quicklisp-to-nix-output/do-urlencode.nix  |   5 +-
 .../documentation-utils.nix                   |  16 +-
 .../quicklisp-to-nix-output/drakma.nix        |   7 +-
 .../dynamic-classes.nix                       |  36 ++
 .../quicklisp-to-nix-output/esrap.nix         |  16 +-
 .../external-program.nix                      |   5 +-
 .../quicklisp-to-nix-output/fast-http.nix     |   2 +
 .../quicklisp-to-nix-output/fast-io.nix       |  17 +-
 .../quicklisp-to-nix-output/flexi-streams.nix |   4 +-
 .../quicklisp-to-nix-output/form-fiddle.nix   |  16 +-
 .../quicklisp-to-nix-output/garbage-pools.nix |  35 ++
 .../quicklisp-to-nix-output/http-body.nix     |   6 +-
 .../quicklisp-to-nix-output/hu.dwim.asdf.nix  |  16 +-
 .../quicklisp-to-nix-output/hu.dwim.def.nix   |  17 +-
 .../hu_dot_dwim_dot_asdf.nix                  |  36 ++
 .../hu_dot_dwim_dot_def.nix                   |  37 ++
 .../quicklisp-to-nix-output/hunchentoot.nix   |   7 +-
 .../quicklisp-to-nix-output/idna.nix          |   4 +-
 .../quicklisp-to-nix-output/ieee-floats.nix   |  35 ++
 .../quicklisp-to-nix-output/iolib.nix         |  18 +-
 .../quicklisp-to-nix-output/ironclad.nix      |  16 +-
 .../quicklisp-to-nix-output/iterate.nix       |   2 +
 .../quicklisp-to-nix-output/ixf.nix           |  35 ++
 .../quicklisp-to-nix-output/jonathan.nix      |  16 +-
 .../lack-middleware-backtrace.nix             |  37 --
 .../quicklisp-to-nix-output/lack-util.nix     |  38 --
 .../quicklisp-to-nix-output/lack.nix          |   2 +
 .../quicklisp-to-nix-output/let-plus.nix      |   5 +-
 .../quicklisp-to-nix-output/lev.nix           |   4 +-
 .../quicklisp-to-nix-output/list-of.nix       |  35 ++
 .../quicklisp-to-nix-output/local-time.nix    |  14 +-
 .../quicklisp-to-nix-output/lparallel.nix     |  36 ++
 .../quicklisp-to-nix-output/lquery.nix        |  17 +-
 .../quicklisp-to-nix-output/map-set.nix       |   2 +
 .../quicklisp-to-nix-output/marshal.nix       |   2 +
 .../quicklisp-to-nix-output/md5.nix           |  14 +-
 .../quicklisp-to-nix-output/metabang-bind.nix |   2 +
 .../metatilities-base.nix                     |  35 ++
 .../quicklisp-to-nix-output/mssql.nix         |  36 ++
 .../quicklisp-to-nix-output/myway.nix         |   7 +-
 .../named-readtables.nix                      |   2 +
 .../quicklisp-to-nix-output/nibbles.nix       |   2 +
 .../quicklisp-to-nix-output/optima.nix        |   5 +-
 .../quicklisp-to-nix-output/parenscript.nix   |   6 +-
 .../quicklisp-to-nix-output/parse-number.nix  |  35 ++
 .../quicklisp-to-nix-output/pcall.nix         |   4 +-
 .../quicklisp-to-nix-output/pgloader.nix      |  47 ++
 .../quicklisp-to-nix-output/plump.nix         |  14 +-
 .../quicklisp-to-nix-output/postmodern.nix    |  36 ++
 .../quicklisp-to-nix-output/proc-parse.nix    |   5 +-
 .../quicklisp-to-nix-output/prove.nix         |   7 +-
 .../quicklisp-to-nix-output/puri.nix          |   2 +
 .../py-configparser.nix                       |  35 ++
 .../quicklisp-to-nix-output/qmynd.nix         |  38 ++
 .../quicklisp-to-nix-output/query-fs.nix      |   6 +-
 .../quicklisp-to-nix-output/quri.nix          |   6 +-
 .../quicklisp-to-nix-output/rfc2388.nix       |   2 +
 .../quicklisp-to-nix-output/salza2.nix        |   2 +
 .../quicklisp-to-nix-output/simple-date.nix   |  35 ++
 .../quicklisp-to-nix-output/smart-buffer.nix  |   6 +-
 .../split-sequence.nix                        |   2 +
 .../quicklisp-to-nix-output/sqlite.nix        |   4 +-
 .../static-vectors.nix                        |   5 +-
 .../quicklisp-to-nix-output/stumpwm.nix       |  16 +-
 .../quicklisp-to-nix-output/swap-bytes.nix    |   4 +-
 .../trivial-backtrace.nix                     |   2 +
 .../trivial-features.nix                      |   2 +
 .../trivial-garbage.nix                       |   2 +
 .../trivial-gray-streams.nix                  |   2 +
 .../trivial-indent.nix                        |  14 +-
 .../quicklisp-to-nix-output/trivial-mimes.nix |  14 +-
 .../quicklisp-to-nix-output/trivial-types.nix |   2 +
 .../quicklisp-to-nix-output/trivial-utf-8.nix |   2 +
 .../quicklisp-to-nix-output/uffi.nix          |   2 +
 .../quicklisp-to-nix-output/uiop.nix          |  14 +-
 .../quicklisp-to-nix-output/usocket.nix       |   4 +-
 .../quicklisp-to-nix-output/uuid.nix          |  35 ++
 .../quicklisp-to-nix-output/vom.nix           |   2 +
 .../quicklisp-to-nix-output/woo.nix           |   2 +
 .../quicklisp-to-nix-output/wookie.nix        |   2 +
 .../quicklisp-to-nix-output/xmls.nix          |   2 +
 .../quicklisp-to-nix-output/xsubseq.nix       |   2 +
 .../quicklisp-to-nix-output/yason.nix         |   5 +-
 .../quicklisp-to-nix-output/zpb-ttf.nix       |   2 +
 .../quicklisp-to-nix-overrides.nix            |  52 +-
 .../lisp-modules/quicklisp-to-nix-systems.txt |  11 +
 .../lisp-modules/quicklisp-to-nix.nix         | 523 +++++++++++-------
 .../quicklisp-to-nix/invocation.emb           |   9 +-
 .../quicklisp-to-nix/nix-package.emb          |   4 +-
 .../quicklisp-to-nix/ql-to-nix.lisp           |  31 +-
 176 files changed, 1969 insertions(+), 614 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/README.txt
 rename pkgs/development/lisp-modules/quicklisp-to-nix-output/{3bmd.nix => _3bmd.nix} (83%)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix

diff --git a/pkgs/development/lisp-modules/README.txt b/pkgs/development/lisp-modules/README.txt
new file mode 100644
index 000000000000..2a2fc9cb4f39
--- /dev/null
+++ b/pkgs/development/lisp-modules/README.txt
@@ -0,0 +1,16 @@
+Prerequisite: have Quicklisp installed somehow.
+
+Add to LD_LIBRARY_PATH all the things listed in quicklisp-to-nix-overrides.nix
+for library propagatedBuildInputs (a lot of these are done via addNativeLibs).
+
+Current list is:
+openssl fuse libuv mariadb libfixposix libev sqlite
+
+Add the needed system names to quicklisp-to-nix-systems.txt and load
+quicklisp-to-nix/ql-to-nix.lisp and call
+(ql-to-nix "/path/to/nixpkgs/pkgs/development/lisp-modules/") which is often
+just (ql-to-nix ".")
+
+Add native libraries and whatever else is needed to overrides.
+
+The lispPackages set is supposed to be buildable in its entirety.
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 1acedf4b7043..83bbdf3b8f98 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -1,4 +1,5 @@
-args @ {stdenv, clwrapper, baseName, testSystems ? [baseName], version ? "latest"
+args @ {stdenv, clwrapper, baseName, packageName ? baseName, testSystems ? [packageName]
+  , version ? "latest"
   , src, description, deps, buildInputs ? [], meta ? {}, overrides?(x: {})
   , propagatedBuildInputs ? []}:
 let
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
similarity index 83%
rename from pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix
rename to pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
index e04b3032091e..4bc7545d9667 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
@@ -1,6 +1,6 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''3bmd'';
+  baseName = ''_3bmd'';
   version = ''20161204-git'';
 
   description = ''markdown processor in CL using esrap parser.'';
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz'';
     sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx'';
   };
+    
+  packageName = "3bmd";
 
   overrides = x: {
     postInstall = ''
@@ -29,6 +31,7 @@ rec {
   };
 }
 /* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL
-    http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd TESTNAME NIL FILENAME 3bmd DEPS
-    ((NAME split-sequence) (NAME esrap) (NAME alexandria)) DEPENDENCIES (split-sequence esrap alexandria) VERSION 20161204-git SIBLINGS
+    http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd TESTNAME NIL FILENAME _3bmd DEPS
+    ((NAME split-sequence FILENAME split-sequence) (NAME esrap FILENAME esrap) (NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (split-sequence esrap alexandria) VERSION 20161204-git SIBLINGS
     (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
new file mode 100644
index 000000000000..1f605fcc7959
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''abnf'';
+  version = ''cl-20150608-git'';
+
+  description = ''ABNF Parser Generator, per RFC2234'';
+
+  deps = [ args."cl-ppcre" args."esrap" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz'';
+    sha256 = ''00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687'';
+  };
+    
+  packageName = "abnf";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/abnf[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM abnf DESCRIPTION ABNF Parser Generator, per RFC2234 SHA256 00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687 URL
+    http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz MD5 311c2b17e49666dac1c2bb45256be708 NAME abnf TESTNAME NIL FILENAME abnf
+    DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME esrap FILENAME esrap)) DEPENDENCIES (cl-ppcre esrap) VERSION cl-20150608-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index d72835e88c64..7f60d2dde204 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''alexandria'';
-  version = ''20170227-git'';
+  version = ''20170516-git'';
 
   description = ''Alexandria is a collection of portable public domain utilities.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz'';
-    sha256 = ''0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh'';
+    url = ''http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz'';
+    sha256 = ''0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82'';
   };
+    
+  packageName = "alexandria";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh
-    URL http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz MD5 b0cbf86723fa3a1fe5c544e8079a3be3 NAME alexandria TESTNAME NIL
-    FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (alexandria-tests)) */
+/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82
+    URL http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz MD5 9234737872493dd82d2da9cadf6a1484 NAME alexandria TESTNAME NIL
+    FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (alexandria-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index fde774a9b24d..cc1eb1962026 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz'';
     sha256 = ''1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9'';
   };
+    
+  packageName = "anaphora";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 0f51b69e2000..800307395350 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''array-utils'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''A few utilities for working with arrays.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/array-utils/2016-09-29/array-utils-20160929-git.tgz'';
-    sha256 = ''1nlrf7b81qq7l85kkdh3fxcs6ngnvh5zk7mb5mwf8vjm5kpfbbcx'';
+    url = ''http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz'';
+    sha256 = ''0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q'';
   };
+    
+  packageName = "array-utils";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 1nlrf7b81qq7l85kkdh3fxcs6ngnvh5zk7mb5mwf8vjm5kpfbbcx URL
-    http://beta.quicklisp.org/archive/array-utils/2016-09-29/array-utils-20160929-git.tgz MD5 8b3880c7b73625cf8ed599d91a3836b4 NAME array-utils TESTNAME NIL
-    FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS (array-utils-test)) */
+/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q URL
+    http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz MD5 c6e4ccbee8f5d72fb86493b419cd0f59 NAME array-utils TESTNAME NIL
+    FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (array-utils-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
new file mode 100644
index 000000000000..f694e4746ac8
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''asdf-system-connections'';
+  version = ''20170124-git'';
+
+  description = ''Allows for ASDF system to be connected so that auto-loading may occur.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz'';
+    sha256 = ''0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq'';
+  };
+    
+  packageName = "asdf-system-connections";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/asdf-system-connections[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM asdf-system-connections DESCRIPTION Allows for ASDF system to be connected so that auto-loading may occur. SHA256
+    0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq URL
+    http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz MD5 23bdbb69c433568e3e15ed705b803992 NAME
+    asdf-system-connections TESTNAME NIL FILENAME asdf-system-connections DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
index 4ad9f00b1507..adc5571a3373 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''babel-streams'';
-  version = ''babel-20150608-git'';
+  version = ''babel-20170516-git'';
 
   description = ''Some useful streams based on Babel's encoding code'';
 
-  deps = [ args."trivial-gray-streams" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz'';
-    sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5'';
+    url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz'';
+    sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk'';
   };
+    
+  packageName = "babel-streams";
 
   overrides = x: {
     postInstall = ''
@@ -28,7 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5 URL
-    http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz MD5 308e6c9132994cf09db7766569ee23fd NAME babel-streams TESTNAME NIL FILENAME
-    babel-streams DEPS ((NAME trivial-gray-streams) (NAME alexandria)) DEPENDENCIES (trivial-gray-streams alexandria) VERSION babel-20150608-git SIBLINGS
-    (babel-tests babel)) */
+/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk URL
+    http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz MD5 d2ab5a273a436375ba40a8ec7f38d0a9 NAME babel-streams TESTNAME NIL FILENAME
+    babel-streams DEPS NIL DEPENDENCIES NIL VERSION babel-20170516-git SIBLINGS (babel-tests babel)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index a88e60824d1a..c9b988388621 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''babel'';
-  version = ''20150608-git'';
+  version = ''20170516-git'';
 
   description = ''Babel, a charset conversion library.'';
 
-  deps = [ args."trivial-features" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz'';
-    sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5'';
+    url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz'';
+    sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk'';
   };
+    
+  packageName = "babel";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5 URL
-    http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz MD5 308e6c9132994cf09db7766569ee23fd NAME babel TESTNAME NIL FILENAME babel DEPS
-    ((NAME trivial-features) (NAME alexandria)) DEPENDENCIES (trivial-features alexandria) VERSION 20150608-git SIBLINGS (babel-streams babel-tests)) */
+/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk URL
+    http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz MD5 d2ab5a273a436375ba40a8ec7f38d0a9 NAME babel TESTNAME NIL FILENAME babel DEPS
+    NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (babel-streams babel-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index 352538cd353c..edeadade715f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz'';
     sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9'';
   };
+    
+  packageName = "blackbird";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM blackbird DESCRIPTION A promise implementation for Common Lisp. SHA256 0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9 URL
     http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz MD5 5cb13dc06a0eae8dcba14714d2b5365d NAME blackbird TESTNAME NIL FILENAME
-    blackbird DEPS ((NAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS (blackbird-test)) */
+    blackbird DEPS ((NAME vom FILENAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS (blackbird-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index adcf9fa5a720..002b2ad0e376 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz'';
     sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd'';
   };
+    
+  packageName = "bordeaux-threads";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM bordeaux-threads DESCRIPTION Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256
     09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz MD5
-    67e363a363e164b6f61a047957b8554e NAME bordeaux-threads TESTNAME NIL FILENAME bordeaux-threads DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION
-    v0.8.5 SIBLINGS NIL) */
+    67e363a363e164b6f61a047957b8554e NAME bordeaux-threads TESTNAME NIL FILENAME bordeaux-threads DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (alexandria) VERSION v0.8.5 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index e5d895adb635..5b5d13bcec1d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz'';
     sha256 = ''111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi'';
   };
+    
+  packageName = "caveman";
 
   overrides = x: {
     postInstall = ''
@@ -31,7 +33,8 @@ rec {
 /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi URL
     http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz MD5 a6700f14fd7c4bf8fdc573473ff5fab6 NAME caveman TESTNAME NIL FILENAME
     caveman DEPS
-    ((NAME myway) (NAME local-time) (NAME do-urlencode) (NAME clack-v1-compat) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-project) (NAME cl-ppcre)
-     (NAME cl-emb) (NAME anaphora))
+    ((NAME myway FILENAME myway) (NAME local-time FILENAME local-time) (NAME do-urlencode FILENAME do-urlencode)
+     (NAME clack-v1-compat FILENAME clack-v1-compat) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-project FILENAME cl-project) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-emb FILENAME cl-emb) (NAME anaphora FILENAME anaphora))
     DEPENDENCIES (myway local-time do-urlencode clack-v1-compat cl-syntax-annot cl-syntax cl-project cl-ppcre cl-emb anaphora) VERSION 20161031-git SIBLINGS
     (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index fdb2ab5b869c..dba9bfcbc762 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
     sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
   };
+    
+  packageName = "cffi-grovel";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
     http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-grovel TESTNAME NIL FILENAME cffi-grovel
-    DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.18.0 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
+    DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.18.0 SIBLINGS
+    (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index 81f3dfad8aad..9f92871b7121 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
     sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
   };
+    
+  packageName = "cffi";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
     http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi TESTNAME NIL FILENAME cffi DEPS
-    ((NAME uiop) (NAME trivial-features) (NAME babel) (NAME alexandria)) DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.18.0 SIBLINGS
+    ((NAME uiop FILENAME uiop) (NAME trivial-features FILENAME trivial-features) (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.18.0 SIBLINGS
     (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index 0a1d054b05ee..e2a9da13b459 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz'';
     sha256 = ''1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826'';
   };
+    
+  packageName = "chipz";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index 6f38719781eb..d6361d4392d1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz'';
     sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg'';
   };
+    
+  packageName = "chunga";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM chunga DESCRIPTION NIL SHA256 1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg URL
     http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz MD5 75f5c4f9dec3a8a181ed5ef7e5d700b5 NAME chunga TESTNAME NIL FILENAME chunga DEPS
-    ((NAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL) */
+    ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index ff69c56e8a6e..39cf82831a97 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz'';
     sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128'';
   };
+    
+  packageName = "circular-streams";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM circular-streams DESCRIPTION Circularly readable streams for Common Lisp SHA256 1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128 URL
     http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams
-    TESTNAME NIL FILENAME circular-streams DEPS ((NAME trivial-gray-streams) (NAME fast-io)) DEPENDENCIES (trivial-gray-streams fast-io) VERSION 20161204-git
-    SIBLINGS (circular-streams-test)) */
+    TESTNAME NIL FILENAME circular-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME fast-io FILENAME fast-io)) DEPENDENCIES
+    (trivial-gray-streams fast-io) VERSION 20161204-git SIBLINGS (circular-streams-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
index 9b19aa516787..bfe44d109d5a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz'';
     sha256 = ''1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s'';
   };
+    
+  packageName = "cl+ssl";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s URL
     http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz MD5 e6d22f98947384d0e0bb2eb18230f72d NAME cl+ssl TESTNAME NIL FILENAME cl+ssl
-    DEPS ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-garbage) (NAME flexi-streams) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES
-    (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20170403-git SIBLINGS (cl+ssl.test)) */
+    DEPS
+    ((NAME uiop FILENAME uiop) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-garbage FILENAME trivial-garbage)
+     (NAME flexi-streams FILENAME flexi-streams) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads))
+    DEPENDENCIES (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20170403-git SIBLINGS (cl+ssl.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 2988906735af..5057ddbd9d1c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-aa'';
-  version = ''cl-vectors-20150407-git'';
+  version = ''cl-vectors-20170516-git'';
 
   description = ''cl-aa: polygon rasterizer'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
-    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz'';
+    sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx'';
   };
+    
+  packageName = "cl-aa";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL
-    http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-aa TESTNAME NIL FILENAME
-    cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20150407-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */
+/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-aa TESTNAME NIL FILENAME
+    cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170516-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index bdf0dbdf48a4..591df96c84e4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz'';
     sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3'';
   };
+    
+  packageName = "cl-annot";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-annot DESCRIPTION Python-like Annotation Syntax for Common Lisp SHA256 0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3 URL
     http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz MD5 35d8f79311bda4dd86002d11edcd0a21 NAME cl-annot TESTNAME NIL FILENAME
-    cl-annot DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150608-git SIBLINGS NIL) */
+    cl-annot DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150608-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index dae0666a7270..51b5b5cf5431 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz'';
     sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m'';
   };
+    
+  packageName = "cl-anonfun";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index 2530203e3b71..0dce1f789449 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz'';
     sha256 = ''112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i'';
   };
+    
+  packageName = "cl-ansi-text";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-ansi-text DESCRIPTION ANSI control string characters, focused on color SHA256 112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i URL
     http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz MD5 70aa38b40377a5e89a7f22bb68b3f796 NAME cl-ansi-text TESTNAME NIL
-    FILENAME cl-ansi-text DEPS ((NAME cl-colors) (NAME alexandria)) DEPENDENCIES (cl-colors alexandria) VERSION 20150804-git SIBLINGS (cl-ansi-text-test)) */
+    FILENAME cl-ansi-text DEPS ((NAME cl-colors FILENAME cl-colors) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (cl-colors alexandria) VERSION
+    20150804-git SIBLINGS (cl-ansi-text-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
index ea9c89dffb71..210e914aeee8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async-base";
 
   overrides = x: {
     postInstall = ''
@@ -32,5 +34,5 @@ rec {
 }
 /* (SYSTEM cl-async-base DESCRIPTION Base system for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-base TESTNAME cl-async
-    FILENAME cl-async-base DEPS ((NAME cl-libuv) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES (cl-libuv cffi bordeaux-threads) VERSION
-    cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
+    FILENAME cl-async-base DEPS ((NAME cl-libuv FILENAME cl-libuv) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES
+    (cl-libuv cffi bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index ccc138a9b5e8..21dd26e4a838 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async-repl";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-repl TESTNAME NIL
-    FILENAME cl-async-repl DEPS ((NAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS
+    FILENAME cl-async-repl DEPS ((NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS
     (cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index dbd056059f75..438a85700e77 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async-ssl";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-ssl TESTNAME NIL
-    FILENAME cl-async-ssl DEPS ((NAME vom) (NAME cffi)) DEPENDENCIES (vom cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-test cl-async)) */
+    FILENAME cl-async-ssl DEPS ((NAME vom FILENAME vom) (NAME cffi FILENAME cffi)) DEPENDENCIES (vom cffi) VERSION cl-async-20160825-git SIBLINGS
+    (cl-async-repl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
index b72be6f88bf9..8bc2b61128f4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async-util";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl-async-util DESCRIPTION Internal utilities for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-util TESTNAME NIL
-    FILENAME cl-async-util DEPS ((NAME vom) (NAME fast-io) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-base) (NAME cffi)) DEPENDENCIES
-    (vom fast-io cl-ppcre cl-libuv cl-async-base cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
+    FILENAME cl-async-util DEPS
+    ((NAME vom FILENAME vom) (NAME fast-io FILENAME fast-io) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-libuv FILENAME cl-libuv)
+     (NAME cl-async-base FILENAME cl-async-base) (NAME cffi FILENAME cffi))
+    DEPENDENCIES (vom fast-io cl-ppcre cl-libuv cl-async-base cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index e484e1d991a6..2e8a5ce83de0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async";
 
   overrides = x: {
     postInstall = ''
@@ -31,7 +33,8 @@ rec {
 /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async TESTNAME NIL FILENAME
     cl-async DEPS
-    ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-features) (NAME static-vectors) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-util)
-     (NAME cl-async-base) (NAME cffi) (NAME babel))
+    ((NAME uiop FILENAME uiop) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-features FILENAME trivial-features)
+     (NAME static-vectors FILENAME static-vectors) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-libuv FILENAME cl-libuv)
+     (NAME cl-async-util FILENAME cl-async-util) (NAME cl-async-base FILENAME cl-async-base) (NAME cffi FILENAME cffi) (NAME babel FILENAME babel))
     DEPENDENCIES (uiop trivial-gray-streams trivial-features static-vectors cl-ppcre cl-libuv cl-async-util cl-async-base cffi babel) VERSION 20160825-git
     SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index 0ca5f7149f22..86cc31f56420 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz'';
     sha256 = ''0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp'';
   };
+    
+  packageName = "cl-base64";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 237fbfaea385..5abdac589dda 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz'';
     sha256 = ''032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4'';
   };
+    
+  packageName = "cl-colors";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-colors DESCRIPTION Simple color library for Common Lisp SHA256 032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4 URL
     http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz MD5 2963c3e7aca2c5db2132394f83716515 NAME cl-colors TESTNAME NIL FILENAME
-    cl-colors DEPS ((NAME alexandria) (NAME let-plus)) DEPENDENCIES (alexandria let-plus) VERSION 20151218-git SIBLINGS NIL) */
+    cl-colors DEPS ((NAME alexandria FILENAME alexandria) (NAME let-plus FILENAME let-plus)) DEPENDENCIES (alexandria let-plus) VERSION 20151218-git SIBLINGS
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
new file mode 100644
index 000000000000..89627b22fbc2
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-containers'';
+  version = ''20170403-git'';
+
+  description = ''A generic container library for Common Lisp'';
+
+  deps = [ args."metatilities-base" args."asdf-system-connections" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz'';
+    sha256 = ''0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg'';
+  };
+    
+  packageName = "cl-containers";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-containers[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-containers DESCRIPTION A generic container library for Common Lisp SHA256 0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg URL
+    http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz MD5 17123cd2b018cd3eb048eceef78be3f8 NAME cl-containers TESTNAME
+    NIL FILENAME cl-containers DEPS ((NAME metatilities-base FILENAME metatilities-base) (NAME asdf-system-connections FILENAME asdf-system-connections))
+    DEPENDENCIES (metatilities-base asdf-system-connections) VERSION 20170403-git SIBLINGS (cl-containers-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index 4d2b56ac7759..5aa6ad1c9c08 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz'';
     sha256 = ''0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8'';
   };
+    
+  packageName = "cl-cookie";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl-cookie DESCRIPTION HTTP cookie manager SHA256 0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8 URL
     http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz MD5 d2c08a71afd47b3ad42e1234ec1a3083 NAME cl-cookie TESTNAME NIL FILENAME
-    cl-cookie DEPS ((NAME quri) (NAME proc-parse) (NAME local-time) (NAME cl-ppcre) (NAME alexandria)) DEPENDENCIES
-    (quri proc-parse local-time cl-ppcre alexandria) VERSION 20150804-git SIBLINGS (cl-cookie-test)) */
+    cl-cookie DEPS
+    ((NAME quri FILENAME quri) (NAME proc-parse FILENAME proc-parse) (NAME local-time FILENAME local-time) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (quri proc-parse local-time cl-ppcre alexandria) VERSION 20150804-git SIBLINGS (cl-cookie-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
new file mode 100644
index 000000000000..3436e5a75a61
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-csv'';
+  version = ''20170403-git'';
+
+  description = ''Facilities for reading and writing CSV format files'';
+
+  deps = [ args."iterate" args."cl-interpol" args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz'';
+    sha256 = ''1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h'';
+  };
+    
+  packageName = "cl-csv";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-csv[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-csv DESCRIPTION Facilities for reading and writing CSV format files SHA256 1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h URL
+    http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz MD5 1e71a90c5057371fab044d440c39f0a3 NAME cl-csv TESTNAME NIL FILENAME cl-csv
+    DEPS ((NAME iterate FILENAME iterate) (NAME cl-interpol FILENAME cl-interpol) (NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (iterate cl-interpol alexandria) VERSION 20170403-git SIBLINGS (cl-csv-clsql cl-csv-data-table)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 781ae6c1d33a..489147c881be 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
     sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
   };
+    
+  packageName = "cl-dbi";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index 7b4c40632a5b..067e09ab0e16 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz'';
     sha256 = ''03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80'';
   };
+    
+  packageName = "cl-emb";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index 2063f2f4be38..43651428bd07 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz'';
     sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x'';
   };
+    
+  packageName = "cl-fad";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256 1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x URL
     http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz MD5 8ee53f2249eca9d7d54e268662b41845 NAME cl-fad TESTNAME NIL FILENAME cl-fad DEPS
-    ((NAME alexandria) (NAME bordeaux-threads)) DEPENDENCIES (alexandria bordeaux-threads) VERSION 0.7.4 SIBLINGS NIL) */
+    ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (alexandria bordeaux-threads) VERSION 0.7.4 SIBLINGS
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index 9d3d779ab486..681b9205e9b3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz'';
     sha256 = ''1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2'';
   };
+    
+  packageName = "cl-fuse-meta-fs";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM cl-fuse-meta-fs DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2 URL
     http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz MD5 eb80b959dd6494cd787cff4f8c2f214b NAME cl-fuse-meta-fs
-    TESTNAME NIL FILENAME cl-fuse-meta-fs DEPS ((NAME bordeaux-threads) (NAME cl-fuse) (NAME iterate) (NAME pcall)) DEPENDENCIES
-    (bordeaux-threads cl-fuse iterate pcall) VERSION 20150608-git SIBLINGS NIL) */
+    TESTNAME NIL FILENAME cl-fuse-meta-fs DEPS
+    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fuse FILENAME cl-fuse) (NAME iterate FILENAME iterate) (NAME pcall FILENAME pcall))
+    DEPENDENCIES (bordeaux-threads cl-fuse iterate pcall) VERSION 20150608-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index 576edbfdbf23..8681110c22e0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz'';
     sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6'';
   };
+    
+  packageName = "cl-fuse";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,8 @@ rec {
 }
 /* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6 URL
     http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz MD5 ce2e907e5ae2cece72fa314be1ced44c NAME cl-fuse TESTNAME NIL FILENAME
-    cl-fuse DEPS ((NAME bordeaux-threads) (NAME cffi) (NAME cffi-grovel) (NAME cl-utilities) (NAME iterate) (NAME trivial-backtrace) (NAME trivial-utf-8))
+    cl-fuse DEPS
+    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cl-utilities FILENAME cl-utilities) (NAME iterate FILENAME iterate) (NAME trivial-backtrace FILENAME trivial-backtrace)
+     (NAME trivial-utf-8 FILENAME trivial-utf-8))
     DEPENDENCIES (bordeaux-threads cffi cffi-grovel cl-utilities iterate trivial-backtrace trivial-utf-8) VERSION 20160318-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
new file mode 100644
index 000000000000..5dae43b6e59c
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-interpol'';
+  version = ''0.2.6'';
+
+  description = '''';
+
+  deps = [ args."cl-unicode" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz'';
+    sha256 = ''172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b'';
+  };
+    
+  packageName = "cl-interpol";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-interpol[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-interpol DESCRIPTION NIL SHA256 172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b URL
+    http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz MD5 1adc92924670601ebb92546ef8bdc6a7 NAME cl-interpol TESTNAME NIL FILENAME
+    cl-interpol DEPS ((NAME cl-unicode FILENAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION 0.2.6 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index 7babd1a459fb..20afe70c7960 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz'';
     sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g'';
   };
+    
+  packageName = "cl-json";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index f782c99a68a2..74d40aa8e793 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz'';
     sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv'';
   };
+    
+  packageName = "cl-l10n-cldr";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index 6c465f14858f..eabcda82eabd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz'';
     sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl'';
   };
+    
+  packageName = "cl-l10n";
 
   overrides = x: {
     postInstall = ''
@@ -31,6 +33,7 @@ rec {
 /* (SYSTEM cl-l10n DESCRIPTION Portable CL Locale Support SHA256 1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl URL
     http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz MD5 c7cb0bb584b061799abaaaf2bd65c9c5 NAME cl-l10n TESTNAME NIL FILENAME
     cl-l10n DEPS
-    ((NAME alexandria) (NAME cl-fad) (NAME cl-l10n-cldr) (NAME cl-ppcre) (NAME closer-mop) (NAME cxml) (NAME flexi-streams) (NAME iterate) (NAME local-time)
-     (NAME metabang-bind))
+    ((NAME alexandria FILENAME alexandria) (NAME cl-fad FILENAME cl-fad) (NAME cl-l10n-cldr FILENAME cl-l10n-cldr) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME closer-mop FILENAME closer-mop) (NAME cxml FILENAME cxml) (NAME flexi-streams FILENAME flexi-streams) (NAME iterate FILENAME iterate)
+     (NAME local-time FILENAME local-time) (NAME metabang-bind FILENAME metabang-bind))
     DEPENDENCIES (alexandria cl-fad cl-l10n-cldr cl-ppcre closer-mop cxml flexi-streams iterate local-time metabang-bind) VERSION 20161204-darcs SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index cca51585e5d7..c08467fdd20d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz'';
     sha256 = ''02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r'';
   };
+    
+  packageName = "cl-libuv";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. SHA256 02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r URL
     http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz MD5 ba5e3cfaadcf710eaee67cc9e716e45a NAME cl-libuv TESTNAME NIL FILENAME
-    cl-libuv DEPS ((NAME alexandria) (NAME cffi) (NAME cffi-grovel)) DEPENDENCIES (alexandria cffi cffi-grovel) VERSION 20160825-git SIBLINGS NIL) */
+    cl-libuv DEPS ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)) DEPENDENCIES
+    (alexandria cffi cffi-grovel) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
new file mode 100644
index 000000000000..cc0a45b6e387
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-log'';
+  version = ''cl-log.1.0.1'';
+
+  description = ''CL-LOG - a general purpose logging utility'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz'';
+    sha256 = ''0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d'';
+  };
+    
+  packageName = "cl-log";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-log[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-log DESCRIPTION CL-LOG - a general purpose logging utility SHA256 0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d URL
+    http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz MD5 fb960933eb748c14adc3ccb376ac8066 NAME cl-log TESTNAME NIL FILENAME cl-log DEPS NIL
+    DEPENDENCIES NIL VERSION cl-log.1.0.1 SIBLINGS (cl-log-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
new file mode 100644
index 000000000000..791b1e558271
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
@@ -0,0 +1,39 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-markdown'';
+  version = ''20101006-darcs'';
+
+  description = '''';
+
+  deps = [ args."metatilities-base" args."metabang-bind" args."dynamic-classes" args."cl-ppcre" args."cl-containers" args."anaphora" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz'';
+    sha256 = ''1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w'';
+  };
+    
+  packageName = "cl-markdown";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-markdown[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-markdown DESCRIPTION NIL SHA256 1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w URL
+    http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz MD5 3e748529531ad1dcbee5443fe24b6300 NAME cl-markdown TESTNAME NIL
+    FILENAME cl-markdown DEPS
+    ((NAME metatilities-base FILENAME metatilities-base) (NAME metabang-bind FILENAME metabang-bind) (NAME dynamic-classes FILENAME dynamic-classes)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-containers FILENAME cl-containers) (NAME anaphora FILENAME anaphora))
+    DEPENDENCIES (metatilities-base metabang-bind dynamic-classes cl-ppcre cl-containers anaphora) VERSION 20101006-darcs SIBLINGS
+    (cl-markdown-comparisons cl-markdown-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index 282b05fefd89..a8f218d37565 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz'';
     sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r'';
   };
+    
+  packageName = "cl-markup";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
index f54fc00950ae..90983764cdac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz'';
     sha256 = ''1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319'';
   };
+    
+  packageName = "cl-mysql";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256 1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319 URL
     http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz MD5 349615d041c2f2177b678088f9c22409 NAME cl-mysql TESTNAME NIL FILENAME
-    cl-mysql DEPS ((NAME cffi)) DEPENDENCIES (cffi) VERSION 20160628-git SIBLINGS (cl-mysql-test)) */
+    cl-mysql DEPS ((NAME cffi FILENAME cffi)) DEPENDENCIES (cffi) VERSION 20160628-git SIBLINGS (cl-mysql-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index 38f57fc61b14..964c94c95d5b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-paths-ttf'';
-  version = ''cl-vectors-20150407-git'';
+  version = ''cl-vectors-20170516-git'';
 
   description = ''cl-paths-ttf: vectorial paths manipulation'';
 
-  deps = [ args."zpb-ttf" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
-    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz'';
+    sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx'';
   };
+    
+  packageName = "cl-paths-ttf";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL
-    http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-paths-ttf TESTNAME NIL
-    FILENAME cl-paths-ttf DEPS ((NAME zpb-ttf)) DEPENDENCIES (zpb-ttf) VERSION cl-vectors-20150407-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors)) */
+/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-paths-ttf TESTNAME NIL
+    FILENAME cl-paths-ttf DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170516-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 66b42fec1757..7766454c1939 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
     sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
   };
+    
+  packageName = "cl-postgres";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
     http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME cl-postgres TESTNAME NIL
-    FILENAME cl-postgres DEPS ((NAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170403-git SIBLINGS (postmodern s-sql simple-date)) */
+    FILENAME cl-postgres DEPS ((NAME md5 FILENAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170403-git SIBLINGS (postmodern s-sql simple-date)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
index 8e687ce64a85..cf46246063f3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-ppcre-template'';
-  version = ''cl-unification-20170124-git'';
+  version = ''cl-unification-20170516-git'';
 
   description = ''A system used to conditionally load the CL-PPCRE Template.
 
@@ -9,12 +9,14 @@ This system is not required and it is handled only if CL-PPCRE is
 available.  If it is, then the library provides the
 REGULAR-EXPRESSION-TEMPLATE.'';
 
-  deps = [ args."cl-ppcre" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz'';
-    sha256 = ''0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9'';
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz'';
+    sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0'';
   };
+    
+  packageName = "cl-ppcre-template";
 
   overrides = x: {
     postInstall = ''
@@ -37,6 +39,6 @@ REGULAR-EXPRESSION-TEMPLATE.'';
 This system is not required and it is handled only if CL-PPCRE is
 available.  If it is, then the library provides the
 REGULAR-EXPRESSION-TEMPLATE.
-    SHA256 0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9 URL http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz
-    MD5 dd277adaf3a0ee41fd0731f78519b1b1 NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION
-    cl-unification-20170124-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */
+    SHA256 0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0 URL http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz
+    MD5 70bcdd486f3444ddd41b5c2c3add119c NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS NIL DEPENDENCIES NIL VERSION
+    cl-unification-20170516-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index 3872bfd5f93b..b79a00f672f4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
     sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
   };
+    
+  packageName = "cl-ppcre-unicode";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL
     http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre-unicode TESTNAME NIL FILENAME
-    cl-ppcre-unicode DEPS ((NAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION cl-ppcre-2.0.11 SIBLINGS (cl-ppcre)) */
+    cl-ppcre-unicode DEPS ((NAME cl-unicode FILENAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION cl-ppcre-2.0.11 SIBLINGS (cl-ppcre)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index ecf4a5de399d..b7c60a16696c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
     sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
   };
+    
+  packageName = "cl-ppcre";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 3a933d2b11d7..74c1213cc6dd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz'';
     sha256 = ''1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81'';
   };
+    
+  packageName = "cl-project";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81 URL
     http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz MD5 63de5ce6f0f3e5f60094a86d32c2f1a9 NAME cl-project TESTNAME NIL
-    FILENAME cl-project DEPS ((NAME uiop) (NAME prove) (NAME local-time) (NAME cl-ppcre) (NAME cl-emb)) DEPENDENCIES (uiop prove local-time cl-ppcre cl-emb)
-    VERSION 20160531-git SIBLINGS (cl-project-test)) */
+    FILENAME cl-project DEPS
+    ((NAME uiop FILENAME uiop) (NAME prove FILENAME prove) (NAME local-time FILENAME local-time) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-emb FILENAME cl-emb))
+    DEPENDENCIES (uiop prove local-time cl-ppcre cl-emb) VERSION 20160531-git SIBLINGS (cl-project-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index cad670acab10..03d863f21221 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz'';
     sha256 = ''1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi'';
   };
+    
+  packageName = "cl-reexport";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-reexport DESCRIPTION Reexport external symbols in other packages. SHA256 1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi URL
     http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz MD5 207d02771cbd906d033ff704ca5c3a3d NAME cl-reexport TESTNAME NIL
-    FILENAME cl-reexport DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150709-git SIBLINGS (cl-reexport-test)) */
+    FILENAME cl-reexport DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150709-git SIBLINGS (cl-reexport-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 0098abf59d3c..1d525c7a675f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz'';
     sha256 = ''0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh'';
   };
+    
+  packageName = "cl-smtp";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256 0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh URL
     http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz MD5 e6bb60e66b0f7d9cc5e4f98aba56998a NAME cl-smtp TESTNAME NIL FILENAME
-    cl-smtp DEPS ((NAME cl+ssl) (NAME cl-base64) (NAME flexi-streams) (NAME trivial-gray-streams) (NAME usocket)) DEPENDENCIES
-    (cl+ssl cl-base64 flexi-streams trivial-gray-streams usocket) VERSION 20160825-git SIBLINGS NIL) */
+    cl-smtp DEPS
+    ((NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) (NAME flexi-streams FILENAME flexi-streams)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME usocket FILENAME usocket))
+    DEPENDENCIES (cl+ssl cl-base64 flexi-streams trivial-gray-streams usocket) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index ba16a64a9f65..9a49e468ce1e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz'';
     sha256 = ''0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz'';
   };
+    
+  packageName = "cl-store";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index abdfc65ec1fb..e82cb4d501f9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
+    
+  packageName = "cl-syntax-annot";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM cl-syntax-annot DESCRIPTION CL-Syntax Reader Syntax for cl-annot SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
     http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-annot TESTNAME NIL
-    FILENAME cl-syntax-annot DEPS ((NAME cl-annot)) DEPENDENCIES (cl-annot) VERSION cl-syntax-20150407-git SIBLINGS
+    FILENAME cl-syntax-annot DEPS ((NAME cl-annot FILENAME cl-annot)) DEPENDENCIES (cl-annot) VERSION cl-syntax-20150407-git SIBLINGS
     (cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
index 32c1a0c0cccc..6680fc51cbc2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
+    
+  packageName = "cl-syntax-anonfun";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM cl-syntax-anonfun DESCRIPTION CL-Syntax Reader Syntax for cl-anonfun SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
     http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-anonfun TESTNAME NIL
-    FILENAME cl-syntax-anonfun DEPS ((NAME cl-anonfun)) DEPENDENCIES (cl-anonfun) VERSION cl-syntax-20150407-git SIBLINGS
+    FILENAME cl-syntax-anonfun DEPS ((NAME cl-anonfun FILENAME cl-anonfun)) DEPENDENCIES (cl-anonfun) VERSION cl-syntax-20150407-git SIBLINGS
     (cl-syntax-annot cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
index 34c5a2e66284..2150b64cb6fc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
+    
+  packageName = "cl-syntax-markup";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM cl-syntax-markup DESCRIPTION CL-Syntax Reader Syntax for CL-Markup SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
     http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-markup TESTNAME NIL
-    FILENAME cl-syntax-markup DEPS ((NAME cl-markup)) DEPENDENCIES (cl-markup) VERSION cl-syntax-20150407-git SIBLINGS
+    FILENAME cl-syntax-markup DEPS ((NAME cl-markup FILENAME cl-markup)) DEPENDENCIES (cl-markup) VERSION cl-syntax-20150407-git SIBLINGS
     (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index bccba7ca8eaa..264d74e2db4f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
+    
+  packageName = "cl-syntax";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM cl-syntax DESCRIPTION Reader Syntax Coventions for Common Lisp and SLIME SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
     http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax TESTNAME NIL FILENAME
-    cl-syntax DEPS ((NAME trivial-types) (NAME named-readtables)) DEPENDENCIES (trivial-types named-readtables) VERSION 20150407-git SIBLINGS
+    cl-syntax DEPS ((NAME trivial-types FILENAME trivial-types) (NAME named-readtables FILENAME named-readtables)) DEPENDENCIES
+    (trivial-types named-readtables) VERSION 20150407-git SIBLINGS
     (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index c0d004c4009b..2e7f97cf66ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz'';
     sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl'';
   };
+    
+  packageName = "cl-test-more";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index d514c1f26a4d..8b0d35253f49 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz'';
     sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n'';
   };
+    
+  packageName = "cl-unicode";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 4c0b0c5c762c..7c5e16973efc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-unification'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''The CL-UNIFICATION system.
 
@@ -10,9 +10,11 @@ The system contains the definitions for the 'unification' machinery.'';
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz'';
-    sha256 = ''0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9'';
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz'';
+    sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0'';
   };
+    
+  packageName = "cl-unification";
 
   overrides = x: {
     postInstall = ''
@@ -33,6 +35,6 @@ The system contains the definitions for the 'unification' machinery.'';
 /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system.
 
 The system contains the definitions for the 'unification' machinery.
-    SHA256 0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9 URL http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz
-    MD5 dd277adaf3a0ee41fd0731f78519b1b1 NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS
+    SHA256 0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0 URL http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz
+    MD5 70bcdd486f3444ddd41b5c2c3add119c NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS
     (cl-unification-lib cl-unification-test cl-ppcre-template)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 099c63daf286..da23cbc94994 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz'';
     sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87'';
   };
+    
+  packageName = "cl-utilities";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index e2e2c956e7d5..fef996a845ba 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-vectors'';
-  version = ''20150407-git'';
+  version = ''20170516-git'';
 
   description = ''cl-paths: vectorial paths manipulation'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
-    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz'';
+    sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx'';
   };
+    
+  packageName = "cl-vectors";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL
-    http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-vectors TESTNAME NIL
-    FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20150407-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */
+/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-vectors TESTNAME NIL
+    FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index ca1303e9d1d9..e5888844c821 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz'';
     sha256 = ''0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq'';
   };
+    
+  packageName = "cl-who";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index b9d894e3f476..e00c430581f2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-v1-compat'';
-  version = ''clack-20170403-git'';
+  version = ''clack-20170516-git'';
 
   description = '''';
 
-  deps = [ args."uiop" args."trivial-types" args."trivial-mimes" args."trivial-backtrace" args."split-sequence" args."quri" args."marshal" args."local-time" args."lack-util" args."lack" args."ironclad" args."http-body" args."flexi-streams" args."cl-syntax-annot" args."cl-ppcre" args."cl-base64" args."circular-streams" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz'';
-    sha256 = ''1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss'';
+    url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz'';
+    sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw'';
   };
+    
+  packageName = "clack-v1-compat";
 
   overrides = x: {
     postInstall = ''
@@ -28,16 +30,9 @@ rec {
     '';
   };
 }
-/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss URL
-    http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz MD5 98643f671285c11e91d2c81d4c8fc52a NAME clack-v1-compat TESTNAME NIL FILENAME
-    clack-v1-compat DEPS
-    ((NAME uiop) (NAME trivial-types) (NAME trivial-mimes) (NAME trivial-backtrace) (NAME split-sequence) (NAME quri) (NAME marshal) (NAME local-time)
-     (NAME lack-util) (NAME lack) (NAME ironclad) (NAME http-body) (NAME flexi-streams) (NAME cl-syntax-annot) (NAME cl-ppcre) (NAME cl-base64)
-     (NAME circular-streams) (NAME alexandria))
-    DEPENDENCIES
-    (uiop trivial-types trivial-mimes trivial-backtrace split-sequence quri marshal local-time lack-util lack ironclad http-body flexi-streams cl-syntax-annot
-     cl-ppcre cl-base64 circular-streams alexandria)
-    VERSION clack-20170403-git SIBLINGS
+/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw URL
+    http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz MD5 ecda950881158c3bf209b29f4717fb0a NAME clack-v1-compat TESTNAME NIL FILENAME
+    clack-v1-compat DEPS NIL DEPENDENCIES NIL VERSION clack-20170516-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
      clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 2d0d3b3d0bc7..43c75bdd6e80 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack'';
-  version = ''20170403-git'';
+  version = ''20170516-git'';
 
   description = ''Web application environment for Common Lisp'';
 
-  deps = [ args."uiop" args."lack-util" args."lack-middleware-backtrace" args."lack" args."bordeaux-threads" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz'';
-    sha256 = ''1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss'';
+    url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz'';
+    sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw'';
   };
+    
+  packageName = "clack";
 
   overrides = x: {
     postInstall = ''
@@ -28,10 +30,9 @@ rec {
     '';
   };
 }
-/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss URL
-    http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz MD5 98643f671285c11e91d2c81d4c8fc52a NAME clack TESTNAME NIL FILENAME clack DEPS
-    ((NAME uiop) (NAME lack-util) (NAME lack-middleware-backtrace) (NAME lack) (NAME bordeaux-threads) (NAME alexandria)) DEPENDENCIES
-    (uiop lack-util lack-middleware-backtrace lack bordeaux-threads alexandria) VERSION 20170403-git SIBLINGS
+/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw URL
+    http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz MD5 ecda950881158c3bf209b29f4717fb0a NAME clack TESTNAME NIL FILENAME clack DEPS
+    NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
      clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index 432da3069d29..d73de2e941ca 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''closer-mop'';
-  version = ''20170403-git'';
+  version = ''20170516-git'';
 
   description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2017-04-03/closer-mop-20170403-git.tgz'';
-    sha256 = ''166k9r55zf0lyvdacvih5y63xv2kp0kqmx9z6jmkyb3snrdghijf'';
+    url = ''http://beta.quicklisp.org/archive/closer-mop/2017-05-16/closer-mop-20170516-git.tgz'';
+    sha256 = ''072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w'';
   };
+    
+  packageName = "closer-mop";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM closer-mop DESCRIPTION
     Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
-    SHA256 166k9r55zf0lyvdacvih5y63xv2kp0kqmx9z6jmkyb3snrdghijf URL http://beta.quicklisp.org/archive/closer-mop/2017-04-03/closer-mop-20170403-git.tgz MD5
-    806918d9975d0c82fc471f95f40972a1 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL) */
+    SHA256 072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w URL http://beta.quicklisp.org/archive/closer-mop/2017-05-16/closer-mop-20170516-git.tgz MD5
+    169ba62f7f8f436e45f182cbe7dd8614 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index 4e7579dba88b..8dca87dc1820 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz'';
     sha256 = ''1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4'';
   };
+    
+  packageName = "closure-common";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM closure-common DESCRIPTION NIL SHA256 1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4 URL
     http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz MD5 12c45a2f0420b2e86fa06cb6575b150a NAME closure-common
-    TESTNAME NIL FILENAME closure-common DEPS ((NAME babel) (NAME trivial-gray-streams)) DEPENDENCIES (babel trivial-gray-streams) VERSION 20101107-git
-    SIBLINGS NIL) */
+    TESTNAME NIL FILENAME closure-common DEPS ((NAME babel FILENAME babel) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES
+    (babel trivial-gray-streams) VERSION 20101107-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
index f5dba03d08e8..76eae519de91 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz'';
     sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn'';
   };
+    
+  packageName = "clsql";
 
   overrides = x: {
     postInstall = ''
@@ -30,6 +32,6 @@ rec {
 }
 /* (SYSTEM clsql DESCRIPTION Common Lisp SQL Interface library SHA256 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL
     http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql TESTNAME NIL FILENAME clsql DEPS
-    ((NAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git SIBLINGS
+    ((NAME uffi FILENAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git SIBLINGS
     (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 clsql-tests
      clsql-uffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index e8af9d041e08..81e50db852b1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clss'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''A DOM tree searching engine based on CSS selectors.'';
 
-  deps = [ args."array-utils" args."plump" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clss/2017-01-24/clss-20170124-git.tgz'';
-    sha256 = ''0rrg3brzash1b14n686xjx6d5glm2vg32g0i8hyvaffqd82493pb'';
+    url = ''http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz'';
+    sha256 = ''1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f'';
   };
+    
+  packageName = "clss";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 0rrg3brzash1b14n686xjx6d5glm2vg32g0i8hyvaffqd82493pb URL
-    http://beta.quicklisp.org/archive/clss/2017-01-24/clss-20170124-git.tgz MD5 f05606cab3a75e01c57fd264d1c71863 NAME clss TESTNAME NIL FILENAME clss DEPS
-    ((NAME array-utils) (NAME plump)) DEPENDENCIES (array-utils plump) VERSION 20170124-git SIBLINGS NIL) */
+/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f URL
+    http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz MD5 2e69a5197694a9654c0e9c5fced4152f NAME clss TESTNAME NIL FILENAME clss DEPS NIL
+    DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
index bf1b1a5e00c8..dfd8669b59f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz'';
     sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67'';
   };
+    
+  packageName = "clx-truetype";
 
   overrides = x: {
     postInstall = ''
@@ -31,5 +33,6 @@ rec {
 /* (SYSTEM clx-truetype DESCRIPTION clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension. SHA256
     0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67 URL http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz MD5
     7c9dedb21d52dedf727de741ac6d9c60 NAME clx-truetype TESTNAME NIL FILENAME clx-truetype DEPS
-    ((NAME cl-aa) (NAME cl-fad) (NAME cl-paths-ttf) (NAME cl-store) (NAME cl-vectors) (NAME clx) (NAME trivial-features) (NAME zpb-ttf)) DEPENDENCIES
-    (cl-aa cl-fad cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf) VERSION 20160825-git SIBLINGS NIL) */
+    ((NAME cl-aa FILENAME cl-aa) (NAME cl-fad FILENAME cl-fad) (NAME cl-paths-ttf FILENAME cl-paths-ttf) (NAME cl-store FILENAME cl-store)
+     (NAME cl-vectors FILENAME cl-vectors) (NAME clx FILENAME clx) (NAME trivial-features FILENAME trivial-features) (NAME zpb-ttf FILENAME zpb-ttf))
+    DEPENDENCIES (cl-aa cl-fad cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index e9e1acfcefc0..b47a7cbd7d4a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clx'';
-  version = ''20170227-git'';
+  version = ''20170516-git'';
 
   description = ''An implementation of the X Window System protocol in Lisp.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz'';
-    sha256 = ''0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx'';
+    url = ''http://beta.quicklisp.org/archive/clx/2017-05-16/clx-20170516-git.tgz'';
+    sha256 = ''00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs'';
   };
+    
+  packageName = "clx";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx URL
-    http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz MD5 fe5fc4bd65ced7a0164abc0ed34afffd NAME clx TESTNAME NIL FILENAME clx DEPS NIL
-    DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
+/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs URL
+    http://beta.quicklisp.org/archive/clx/2017-05-16/clx-20170516-git.tgz MD5 1f5d7963802a503d7f7fcf73e1f42dd8 NAME clx TESTNAME NIL FILENAME clx DEPS NIL
+    DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 62010efd0472..276b13e1bd09 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz'';
     sha256 = ''07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh'';
   };
+    
+  packageName = "command-line-arguments";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index 3f8886915a02..695164566ba3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz'';
     sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg'';
   };
+    
+  packageName = "css-lite";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
index 041cc5b84815..924b61cae6e1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml-dom";
 
   overrides = x: {
     postInstall = ''
@@ -32,4 +34,4 @@ rec {
 }
 /* (SYSTEM cxml-dom DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-dom TESTNAME cxml FILENAME cxml-dom
-    DEPS ((NAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
+    DEPS ((NAME cxml-xml FILENAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
index 15dd75fbfa6a..f8418ccf27f2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml-klacks";
 
   overrides = x: {
     postInstall = ''
@@ -32,4 +34,4 @@ rec {
 }
 /* (SYSTEM cxml-klacks DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-klacks TESTNAME cxml FILENAME
-    cxml-klacks DEPS ((NAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
+    cxml-klacks DEPS ((NAME cxml-xml FILENAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
index 4a872802ecb5..e8856352dcd5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml-test";
 
   overrides = x: {
     postInstall = ''
@@ -32,4 +34,5 @@ rec {
 }
 /* (SYSTEM cxml-test DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-test TESTNAME cxml FILENAME
-    cxml-test DEPS ((NAME cxml-xml) (NAME cxml-klacks) (NAME cxml-dom)) DEPENDENCIES (cxml-xml cxml-klacks cxml-dom) VERSION cxml-20110619-git SIBLINGS (cxml)) */
+    cxml-test DEPS ((NAME cxml-xml FILENAME cxml-xml) (NAME cxml-klacks FILENAME cxml-klacks) (NAME cxml-dom FILENAME cxml-dom)) DEPENDENCIES
+    (cxml-xml cxml-klacks cxml-dom) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
index 9674eca3d1a0..5d8ef1587724 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml-xml";
 
   overrides = x: {
     postInstall = ''
@@ -32,5 +34,5 @@ rec {
 }
 /* (SYSTEM cxml-xml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-xml TESTNAME cxml FILENAME cxml-xml
-    DEPS ((NAME trivial-gray-streams) (NAME puri) (NAME closure-common)) DEPENDENCIES (trivial-gray-streams puri closure-common) VERSION cxml-20110619-git
-    SIBLINGS (cxml)) */
+    DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME puri FILENAME puri) (NAME closure-common FILENAME closure-common)) DEPENDENCIES
+    (trivial-gray-streams puri closure-common) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index 3c17f72b42a4..baab538ca38b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cxml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml TESTNAME NIL FILENAME cxml DEPS
-    ((NAME cxml-dom) (NAME cxml-klacks) (NAME cxml-test)) DEPENDENCIES (cxml-dom cxml-klacks cxml-test) VERSION 20110619-git SIBLINGS NIL) */
+    ((NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) (NAME cxml-test FILENAME cxml-test)) DEPENDENCIES
+    (cxml-dom cxml-klacks cxml-test) VERSION 20110619-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
new file mode 100644
index 000000000000..06ffeb9ad69a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''db3'';
+  version = ''cl-20150302-git'';
+
+  description = ''DB3 file reader'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz'';
+    sha256 = ''0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi'';
+  };
+    
+  packageName = "db3";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/db3[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM db3 DESCRIPTION DB3 file reader SHA256 0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi URL
+    http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz MD5 578896a3f60f474742f240b703f8c5f5 NAME db3 TESTNAME NIL FILENAME db3 DEPS
+    NIL DEPENDENCIES NIL VERSION cl-20150302-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 4ba68b6c545c..93d0e3d599b8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
     sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
   };
+    
+  packageName = "dbd-mysql";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
     http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-mysql TESTNAME NIL FILENAME
-    dbd-mysql DEPS ((NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-mysql)) DEPENDENCIES (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170124-git
-    SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */
+    dbd-mysql DEPS ((NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-mysql FILENAME cl-mysql)) DEPENDENCIES
+    (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 0d0c3f153ef9..3c963b5141ed 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
     sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
   };
+    
+  packageName = "dbd-postgres";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
     http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-postgres TESTNAME NIL FILENAME
-    dbd-postgres DEPS ((NAME trivial-garbage) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-postgres)) DEPENDENCIES
-    (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */
+    dbd-postgres DEPS
+    ((NAME trivial-garbage FILENAME trivial-garbage) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-postgres FILENAME cl-postgres))
+    DEPENDENCIES (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index f4c38e485f9a..e19565fc2771 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
     sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
   };
+    
+  packageName = "dbd-sqlite3";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
     http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-sqlite3 TESTNAME NIL FILENAME
-    dbd-sqlite3 DEPS ((NAME uiop) (NAME sqlite) (NAME cl-syntax-annot) (NAME cl-syntax)) DEPENDENCIES (uiop sqlite cl-syntax-annot cl-syntax) VERSION
-    cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */
+    dbd-sqlite3 DEPS
+    ((NAME uiop FILENAME uiop) (NAME sqlite FILENAME sqlite) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)) DEPENDENCIES
+    (uiop sqlite cl-syntax-annot cl-syntax) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 95672b7296f7..54f1cf78e40a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dexador'';
-  version = ''20170403-git'';
+  version = ''20170516-git'';
 
   description = ''Yet another HTTP client for Common Lisp'';
 
-  deps = [ args."usocket" args."trivial-mimes" args."trivial-gray-streams" args."quri" args."fast-io" args."fast-http" args."cl-reexport" args."cl-ppcre" args."cl-cookie" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" args."bordeaux-threads" args."babel" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dexador/2017-04-03/dexador-20170403-git.tgz'';
-    sha256 = ''0lnz36215wccpjgvrv9r7fa1i94jcdyw6q3hlgx9h8b7pwdlcfbn'';
+    url = ''http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz'';
+    sha256 = ''129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6'';
   };
+    
+  packageName = "dexador";
 
   overrides = x: {
     postInstall = ''
@@ -28,12 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 0lnz36215wccpjgvrv9r7fa1i94jcdyw6q3hlgx9h8b7pwdlcfbn URL
-    http://beta.quicklisp.org/archive/dexador/2017-04-03/dexador-20170403-git.tgz MD5 0330a50a117313dbe0ba3f136b0fa416 NAME dexador TESTNAME NIL FILENAME
-    dexador DEPS
-    ((NAME usocket) (NAME trivial-mimes) (NAME trivial-gray-streams) (NAME quri) (NAME fast-io) (NAME fast-http) (NAME cl-reexport) (NAME cl-ppcre)
-     (NAME cl-cookie) (NAME cl-base64) (NAME cl+ssl) (NAME chunga) (NAME chipz) (NAME bordeaux-threads) (NAME babel) (NAME alexandria))
-    DEPENDENCIES
-    (usocket trivial-mimes trivial-gray-streams quri fast-io fast-http cl-reexport cl-ppcre cl-cookie cl-base64 cl+ssl chunga chipz bordeaux-threads babel
-     alexandria)
-    VERSION 20170403-git SIBLINGS (dexador-test)) */
+/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6 URL
+    http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz MD5 463972f0b98fd2a641ce2bfab4400dc7 NAME dexador TESTNAME NIL FILENAME
+    dexador DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (dexador-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 608cd6b38961..993a49bc9f95 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz'';
     sha256 = ''19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa'';
   };
+    
+  packageName = "do-urlencode";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library SHA256 19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa URL
     http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz MD5 c8085e138711c225042acf83b4bf0507 NAME do-urlencode TESTNAME NIL
-    FILENAME do-urlencode DEPS ((NAME babel) (NAME babel-streams)) DEPENDENCIES (babel babel-streams) VERSION 20130720-git SIBLINGS NIL) */
+    FILENAME do-urlencode DEPS ((NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams)) DEPENDENCIES (babel babel-streams) VERSION
+    20130720-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 43f6343b7ebe..d9bacd96af89 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''documentation-utils'';
-  version = ''20161204-git'';
+  version = ''20170516-git'';
 
   description = ''A few simple tools to help you with documenting your library.'';
 
-  deps = [ args."trivial-indent" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/documentation-utils/2016-12-04/documentation-utils-20161204-git.tgz'';
-    sha256 = ''0vyj5nvy697w2fvp2rb42jxgqah85ivz1hg84amqfi4bvik2npvq'';
+    url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz'';
+    sha256 = ''0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1'';
   };
+    
+  packageName = "documentation-utils";
 
   overrides = x: {
     postInstall = ''
@@ -29,6 +31,6 @@ rec {
   };
 }
 /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256
-    0vyj5nvy697w2fvp2rb42jxgqah85ivz1hg84amqfi4bvik2npvq URL
-    http://beta.quicklisp.org/archive/documentation-utils/2016-12-04/documentation-utils-20161204-git.tgz MD5 36a233bf438bfc067b074b6a05865c33 NAME
-    documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS ((NAME trivial-indent)) DEPENDENCIES (trivial-indent) VERSION 20161204-git SIBLINGS NIL) */
+    0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1 URL
+    http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz MD5 5e04421eb7fd48d8abe1757b5211e310 NAME
+    documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index 82695e74bfe7..16bbac4d03a1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz'';
     sha256 = ''1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z'';
   };
+    
+  packageName = "drakma";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket SHA256 1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z URL
     http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz MD5 eb51e1417c02c912c2b43bd9605dfb50 NAME drakma TESTNAME NIL FILENAME drakma DEPS
-    ((NAME usocket) (NAME puri) (NAME flexi-streams) (NAME cl-ppcre) (NAME cl-base64) (NAME cl+ssl) (NAME chunga) (NAME chipz)) DEPENDENCIES
-    (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION 2.0.2 SIBLINGS (drakma-test)) */
+    ((NAME usocket FILENAME usocket) (NAME puri FILENAME puri) (NAME flexi-streams FILENAME flexi-streams) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-base64 FILENAME cl-base64) (NAME cl+ssl FILENAME cl+ssl) (NAME chunga FILENAME chunga) (NAME chipz FILENAME chipz))
+    DEPENDENCIES (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION 2.0.2 SIBLINGS (drakma-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
new file mode 100644
index 000000000000..283dfe813ac7
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''dynamic-classes'';
+  version = ''20130128-git'';
+
+  description = '''';
+
+  deps = [ args."metatilities-base" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz'';
+    sha256 = ''0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa'';
+  };
+    
+  packageName = "dynamic-classes";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dynamic-classes[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM dynamic-classes DESCRIPTION NIL SHA256 0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa URL
+    http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz MD5 a6ed01c4f21df2b6a142328b24ac7ba3 NAME dynamic-classes
+    TESTNAME NIL FILENAME dynamic-classes DEPS ((NAME metatilities-base FILENAME metatilities-base)) DEPENDENCIES (metatilities-base) VERSION 20130128-git
+    SIBLINGS (dynamic-classes-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 60db24e57d04..49c0ff6c8ce4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''esrap'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.'';
 
-  deps = [ args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz'';
-    sha256 = ''1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8'';
+    url = ''http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz'';
+    sha256 = ''06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8'';
   };
+    
+  packageName = "esrap";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8 URL
-    http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz MD5 72f7a7d8e5808586dfd3ab1698e3d11f NAME esrap TESTNAME NIL FILENAME esrap DEPS
-    ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20170124-git SIBLINGS NIL) */
+/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8 URL
+    http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz MD5 6116df281050ee58e6ba195727154ac0 NAME esrap TESTNAME NIL FILENAME esrap DEPS
+    NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index aa7963f32438..698189fc9113 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz'';
     sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13'';
   };
+    
+  packageName = "external-program";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM external-program DESCRIPTION NIL SHA256 0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13 URL
     http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz MD5 6902724c4f762a17645c46b0a1d8efde NAME external-program
-    TESTNAME NIL FILENAME external-program DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION 20160825-git SIBLINGS NIL) */
+    TESTNAME NIL FILENAME external-program DEPS ((NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (trivial-features) VERSION 20160825-git
+    SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 1f83d5629674..7b100d891b92 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz'';
     sha256 = ''0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx'';
   };
+    
+  packageName = "fast-http";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 52cbc8ddcdb8..0e8194931091 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''fast-io'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''Alternative I/O mechanism to a stream or vector'';
 
-  deps = [ args."trivial-gray-streams" args."static-vectors" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz'';
-    sha256 = ''0w57iddbpdcchnv3zg7agd3ydm36aw2mni4iasi8wd628gq9a6i2'';
+    url = ''http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz'';
+    sha256 = ''1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1'';
   };
+    
+  packageName = "fast-io";
 
   overrides = x: {
     postInstall = ''
@@ -28,7 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 0w57iddbpdcchnv3zg7agd3ydm36aw2mni4iasi8wd628gq9a6i2 URL
-    http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz MD5 e9fa77c0e75a9f32e56c27ef6861bce2 NAME fast-io TESTNAME NIL FILENAME
-    fast-io DEPS ((NAME trivial-gray-streams) (NAME static-vectors) (NAME alexandria)) DEPENDENCIES (trivial-gray-streams static-vectors alexandria) VERSION
-    20170124-git SIBLINGS (fast-io-test)) */
+/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1 URL
+    http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz MD5 a9a96c0f6260271446fd43bf2e51e90f NAME fast-io TESTNAME NIL FILENAME
+    fast-io DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (fast-io-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 2348167ba657..1bb2b6b9c188 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz'';
     sha256 = ''0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p'';
   };
+    
+  packageName = "flexi-streams";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp SHA256 0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p URL
     http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz MD5 02dbb5a0c5f982e0c7a88aad9a25004e NAME flexi-streams TESTNAME NIL
-    FILENAME flexi-streams DEPS ((NAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL) */
+    FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index e12f3efb59ac..754d2f8c8691 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''form-fiddle'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''A collection of utilities to destructure lambda forms.'';
 
-  deps = [ args."documentation-utils" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/form-fiddle/2016-09-29/form-fiddle-20160929-git.tgz'';
-    sha256 = ''1lmdxvwh0d81jlkc9qq2cw0bizjbmk7f5fjcb8ps65andfyj9bd7'';
+    url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz'';
+    sha256 = ''00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh'';
   };
+    
+  packageName = "form-fiddle";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 1lmdxvwh0d81jlkc9qq2cw0bizjbmk7f5fjcb8ps65andfyj9bd7 URL
-    http://beta.quicklisp.org/archive/form-fiddle/2016-09-29/form-fiddle-20160929-git.tgz MD5 d7c363b70125a65d909419b78fa7dc24 NAME form-fiddle TESTNAME NIL
-    FILENAME form-fiddle DEPS ((NAME documentation-utils)) DEPENDENCIES (documentation-utils) VERSION 20160929-git SIBLINGS NIL) */
+/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh URL
+    http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz MD5 8f0d8b920f6da0c7fd939b7096c30235 NAME form-fiddle TESTNAME NIL
+    FILENAME form-fiddle DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
new file mode 100644
index 000000000000..72403e8598a9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''garbage-pools'';
+  version = ''20130720-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz'';
+    sha256 = ''1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05'';
+  };
+    
+  packageName = "garbage-pools";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/garbage-pools[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM garbage-pools DESCRIPTION NIL SHA256 1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05 URL
+    http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz MD5 f691e2ddf6ba22b3451c24b61d4ee8b6 NAME garbage-pools TESTNAME
+    NIL FILENAME garbage-pools DEPS NIL DEPENDENCIES NIL VERSION 20130720-git SIBLINGS (garbage-pools-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index ed38c44b0c11..e6510c59c30d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz'';
     sha256 = ''1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi'';
   };
+    
+  packageName = "http-body";
 
   overrides = x: {
     postInstall = ''
@@ -31,5 +33,7 @@ rec {
 /* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256 1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi URL
     http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body TESTNAME NIL FILENAME
     http-body DEPS
-    ((NAME trivial-gray-streams) (NAME quri) (NAME jonathan) (NAME flexi-streams) (NAME fast-http) (NAME cl-utilities) (NAME cl-ppcre) (NAME babel))
+    ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME quri FILENAME quri) (NAME jonathan FILENAME jonathan)
+     (NAME flexi-streams FILENAME flexi-streams) (NAME fast-http FILENAME fast-http) (NAME cl-utilities FILENAME cl-utilities)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME babel FILENAME babel))
     DEPENDENCIES (trivial-gray-streams quri jonathan flexi-streams fast-http cl-utilities cl-ppcre babel) VERSION 20161204-git SIBLINGS (http-body-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
index c37de8f6f8dd..f36b4e931ec7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''hu.dwim.asdf'';
-  version = ''20170403-darcs'';
+  version = ''20170516-darcs'';
 
   description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
 
-  deps = [ args."uiop" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-04-03/hu.dwim.asdf-20170403-darcs.tgz'';
-    sha256 = ''0avhfdg2ypv0cnwzihq64zwd562c4ls4bx6014mwgdfggp4b00ll'';
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz'';
+    sha256 = ''0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw'';
   };
+    
+  packageName = "hu.dwim.asdf";
 
   overrides = x: {
     postInstall = ''
@@ -29,6 +31,6 @@ rec {
   };
 }
 /* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256
-    0avhfdg2ypv0cnwzihq64zwd562c4ls4bx6014mwgdfggp4b00ll URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-04-03/hu.dwim.asdf-20170403-darcs.tgz MD5
-    53cbeb56a8ee066116069d80c7fc3f65 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION 20170403-darcs
-    SIBLINGS (hu.dwim.asdf.documentation)) */
+    0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz MD5
+    041447371d36ceb17f58854671c052f1 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
+    (hu.dwim.asdf.documentation)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
index 0649edb6fd34..2aedd0f6704c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''hu.dwim.def'';
-  version = ''20161204-darcs'';
+  version = ''20170516-darcs'';
 
   description = ''General purpose, homogenous, extensible definer macro.'';
 
-  deps = [ args."metabang-bind" args."iterate" args."hu.dwim.asdf" args."anaphora" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2016-12-04/hu.dwim.def-20161204-darcs.tgz'';
-    sha256 = ''0znvcm4zi8rivyk0s840v8jaa52hzdiql88pk8hnaj8abxkvl3lj'';
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz'';
+    sha256 = ''1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by'';
   };
+    
+  packageName = "hu.dwim.def";
 
   overrides = x: {
     postInstall = ''
@@ -28,9 +30,8 @@ rec {
     '';
   };
 }
-/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 0znvcm4zi8rivyk0s840v8jaa52hzdiql88pk8hnaj8abxkvl3lj URL
-    http://beta.quicklisp.org/archive/hu.dwim.def/2016-12-04/hu.dwim.def-20161204-darcs.tgz MD5 c4a85c220873a9edd1c2c49a6498baca NAME hu.dwim.def TESTNAME NIL
-    FILENAME hu.dwim.def DEPS ((NAME metabang-bind) (NAME iterate) (NAME hu.dwim.asdf) (NAME anaphora) (NAME alexandria)) DEPENDENCIES
-    (metabang-bind iterate hu.dwim.asdf anaphora alexandria) VERSION 20161204-darcs SIBLINGS
+/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by URL
+    http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz MD5 bd13311ab8da2a67f9247e825369b294 NAME hu.dwim.def TESTNAME NIL
+    FILENAME hu.dwim.def DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
     (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation
      hu.dwim.def.namespace hu.dwim.def.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
new file mode 100644
index 000000000000..b358ff0562d9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''hu_dot_dwim_dot_asdf'';
+  version = ''20170516-darcs'';
+
+  description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz'';
+    sha256 = ''0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw'';
+  };
+    
+  packageName = "hu.dwim.asdf";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.asdf[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256
+    0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz MD5
+    041447371d36ceb17f58854671c052f1 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu_dot_dwim_dot_asdf DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
+    (hu.dwim.asdf.documentation)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
new file mode 100644
index 000000000000..5e5e56be2e58
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
@@ -0,0 +1,37 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''hu_dot_dwim_dot_def'';
+  version = ''20170516-darcs'';
+
+  description = ''General purpose, homogenous, extensible definer macro.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz'';
+    sha256 = ''1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by'';
+  };
+    
+  packageName = "hu.dwim.def";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.def[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by URL
+    http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz MD5 bd13311ab8da2a67f9247e825369b294 NAME hu.dwim.def TESTNAME NIL
+    FILENAME hu_dot_dwim_dot_def DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
+    (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation
+     hu.dwim.def.namespace hu.dwim.def.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index e77e977ea3f5..e0a2d194f9ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -14,6 +14,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz'';
     sha256 = ''0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74'';
   };
+    
+  packageName = "hunchentoot";
 
   overrides = x: {
     postInstall = ''
@@ -37,6 +39,7 @@ rec {
   through subclassing.
     SHA256 0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74 URL http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz MD5
     d1ce17dec454cab119c0f263e8a176d1 NAME hunchentoot TESTNAME NIL FILENAME hunchentoot DEPS
-    ((NAME bordeaux-threads) (NAME chunga) (NAME cl+ssl) (NAME cl-base64) (NAME cl-fad) (NAME cl-ppcre) (NAME flexi-streams) (NAME md5) (NAME rfc2388)
-     (NAME trivial-backtrace) (NAME usocket))
+    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME md5 FILENAME md5)
+     (NAME rfc2388 FILENAME rfc2388) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME usocket FILENAME usocket))
     DEPENDENCIES (bordeaux-threads chunga cl+ssl cl-base64 cl-fad cl-ppcre flexi-streams md5 rfc2388 trivial-backtrace usocket) VERSION 1.2.35 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index ea7dd30df0b9..d849cf15272a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz'';
     sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c'';
   };
+    
+  packageName = "idna";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM idna DESCRIPTION IDNA (international domain names) string encoding and decoding routines SHA256 0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c
     URL http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz MD5 85b91a66efe4381bf116cdb5d2b756b6 NAME idna TESTNAME NIL FILENAME idna DEPS
-    ((NAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20120107-git SIBLINGS NIL) */
+    ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20120107-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
new file mode 100644
index 000000000000..fb106aa54c5d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''ieee-floats'';
+  version = ''20160318-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz'';
+    sha256 = ''0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4'';
+  };
+    
+  packageName = "ieee-floats";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ieee-floats[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM ieee-floats DESCRIPTION NIL SHA256 0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4 URL
+    http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz MD5 84d679a4dffddc3b0cff944adde623c5 NAME ieee-floats TESTNAME NIL
+    FILENAME ieee-floats DEPS NIL DEPENDENCIES NIL VERSION 20160318-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index 55dd6b2a3731..404c7a5dee9f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''iolib'';
-  version = ''v0.8.1'';
+  version = ''v0.8.2'';
 
   description = ''I/O library.'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."split-sequence" args."swap-bytes" args."trivial-features" args."uiop" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
-    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz'';
+    sha256 = ''1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr'';
   };
+    
+  packageName = "iolib";
 
   overrides = x: {
     postInstall = ''
@@ -28,8 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481 URL
-    http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz MD5 cd34c4f7db4af7391757ebc3f4f61422 NAME iolib TESTNAME NIL FILENAME iolib DEPS
-    ((NAME alexandria) (NAME babel) (NAME bordeaux-threads) (NAME cffi) (NAME idna) (NAME split-sequence) (NAME swap-bytes) (NAME trivial-features)
-     (NAME uiop))
-    DEPENDENCIES (alexandria babel bordeaux-threads cffi idna split-sequence swap-bytes trivial-features uiop) VERSION v0.8.1 SIBLINGS NIL) */
+/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr URL
+    http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz MD5 cd2d4d2893b7e6d0502d9a16e717a2e9 NAME iolib TESTNAME NIL FILENAME iolib DEPS NIL
+    DEPENDENCIES NIL VERSION v0.8.2 SIBLINGS (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index de5528bca5e6..944781947fa9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''ironclad'';
-  version = ''ironclad_0.33.0'';
+  version = ''v0.34'';
 
   description = ''A cryptographic toolkit written in pure Common Lisp'';
 
-  deps = [ args."nibbles" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ironclad/2014-11-06/ironclad_0.33.0.tgz'';
-    sha256 = ''1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7'';
+    url = ''http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz'';
+    sha256 = ''08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0'';
   };
+    
+  packageName = "ironclad";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7 URL
-    http://beta.quicklisp.org/archive/ironclad/2014-11-06/ironclad_0.33.0.tgz MD5 2b7befe607e2fedffbdd45b2443db718 NAME ironclad TESTNAME NIL FILENAME ironclad
-    DEPS ((NAME nibbles)) DEPENDENCIES (nibbles) VERSION ironclad_0.33.0 SIBLINGS (ironclad-text)) */
+/* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0 URL
+    http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad TESTNAME NIL FILENAME ironclad
+    DEPS NIL DEPENDENCIES NIL VERSION v0.34 SIBLINGS (ironclad-text)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index 446b54a455a6..5e02dceb84c5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz'';
     sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm'';
   };
+    
+  packageName = "iterate";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
new file mode 100644
index 000000000000..3d2da3fa6bc1
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''ixf'';
+  version = ''cl-20170516-git'';
+
+  description = ''Tools to handle IBM PC version of IXF file format'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-ixf/2017-05-16/cl-ixf-20170516-git.tgz'';
+    sha256 = ''0x32zlayynfj6g676afl0zna63jcgf333n3izapa84y5zgqp3nwf'';
+  };
+    
+  packageName = "ixf";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ixf[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format SHA256 0x32zlayynfj6g676afl0zna63jcgf333n3izapa84y5zgqp3nwf URL
+    http://beta.quicklisp.org/archive/cl-ixf/2017-05-16/cl-ixf-20170516-git.tgz MD5 1c4c5ff76bb6fa9c19fe47d064c512b9 NAME ixf TESTNAME NIL FILENAME ixf DEPS
+    NIL DEPENDENCIES NIL VERSION cl-20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index 905a14b785c7..841c210a5aed 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''jonathan'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
 
-  deps = [ args."trivial-types" args."proc-parse" args."fast-io" args."cl-syntax-annot" args."cl-syntax" args."cl-ppcre" args."cl-annot" args."babel" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz'';
-    sha256 = ''1r54w7i1fxaqz6q7idamcy3bvsg0pvfjcs2qq4dag519zwcpln5l'';
+    url = ''http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz'';
+    sha256 = ''00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q'';
   };
+    
+  packageName = "jonathan";
 
   overrides = x: {
     postInstall = ''
@@ -29,7 +31,5 @@ rec {
   };
 }
 /* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. SHA256
-    1r54w7i1fxaqz6q7idamcy3bvsg0pvfjcs2qq4dag519zwcpln5l URL http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz MD5
-    f33377a22a3b1d948f294985acec20ad NAME jonathan TESTNAME NIL FILENAME jonathan DEPS
-    ((NAME trivial-types) (NAME proc-parse) (NAME fast-io) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-ppcre) (NAME cl-annot) (NAME babel)) DEPENDENCIES
-    (trivial-types proc-parse fast-io cl-syntax-annot cl-syntax cl-ppcre cl-annot babel) VERSION 20170124-git SIBLINGS (jonathan-test)) */
+    00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q URL http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz MD5
+    b05ccc0140e70636240f216fdc14e4d3 NAME jonathan TESTNAME NIL FILENAME jonathan DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (jonathan-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
deleted file mode 100644
index ba24d7dd78c3..000000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''lack-middleware-backtrace'';
-  version = ''lack-20161204-git'';
-
-  description = '''';
-
-  deps = [ args."uiop" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
-    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-middleware-backtrace[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL
-    http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack-middleware-backtrace TESTNAME NIL
-    FILENAME lack-middleware-backtrace DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION lack-20161204-git SIBLINGS
-    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session
-     lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test lack-util-writer-stream lack-util lack
-     t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
-     t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
deleted file mode 100644
index 9b60f52c87f7..000000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''lack-util'';
-  version = ''lack-20161204-git'';
-
-  description = '''';
-
-  deps = [ args."ironclad" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
-    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-util[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM lack-util DESCRIPTION NIL SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL
-    http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack-util TESTNAME NIL FILENAME lack-util
-    DEPS ((NAME ironclad)) DEPENDENCIES (ironclad) VERSION lack-20161204-git SIBLINGS
-    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
-     lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test
-     lack-util-writer-stream lack t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf
-     t-lack-middleware-mount t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util
-     t-lack)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index ceed43659662..2e8c2fe291fb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
     sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
   };
+    
+  packageName = "lack";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index c01500f0c3da..4082abbe656d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz'';
     sha256 = ''1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8'';
   };
+    
+  packageName = "let-plus";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM let-plus DESCRIPTION Destructuring extension of LET*. SHA256 1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8 URL
     http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz MD5 1180608e4da53f3866a99d4cca72e3b1 NAME let-plus TESTNAME NIL FILENAME
-    let-plus DEPS ((NAME alexandria) (NAME anaphora)) DEPENDENCIES (alexandria anaphora) VERSION 20170124-git SIBLINGS NIL) */
+    let-plus DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)) DEPENDENCIES (alexandria anaphora) VERSION 20170124-git SIBLINGS
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index 9d4aa874d4cc..f35ba345d1b1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz'';
     sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl'';
   };
+    
+  packageName = "lev";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM lev DESCRIPTION libev bindings for Common Lisp SHA256 0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl URL
     http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz MD5 10f340f7500beb98b5c0d4a9876131fb NAME lev TESTNAME NIL FILENAME lev DEPS
-    ((NAME cffi)) DEPENDENCIES (cffi) VERSION 20150505-git SIBLINGS NIL) */
+    ((NAME cffi FILENAME cffi)) DEPENDENCIES (cffi) VERSION 20150505-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
new file mode 100644
index 000000000000..720afedb815b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''list-of'';
+  version = ''asdf-finalizers-20170403-git'';
+
+  description = ''magic list-of deftype'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz'';
+    sha256 = ''1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj'';
+  };
+    
+  packageName = "list-of";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/list-of[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM list-of DESCRIPTION magic list-of deftype SHA256 1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj URL
+    http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz MD5 a9e3c960e6b6fdbd69640b520ef8044b NAME list-of TESTNAME
+    NIL FILENAME list-of DEPS NIL DEPENDENCIES NIL VERSION asdf-finalizers-20170403-git SIBLINGS (asdf-finalizers-test asdf-finalizers)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index e2e7e71aadda..0740ec0779fd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''local-time'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''A library for manipulating dates and times, based on a paper by Erik Naggum'';
 
-  deps = [ args."cl-fad" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/local-time/2017-01-24/local-time-20170124-git.tgz'';
-    sha256 = ''0nf21bhclr2cwpflf733wn6hr6mcz94dr796jk91f0ck28nf7ab1'';
+    url = ''http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz'';
+    sha256 = ''0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p'';
   };
+    
+  packageName = "local-time";
 
   overrides = x: {
     postInstall = ''
@@ -29,6 +31,6 @@ rec {
   };
 }
 /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum SHA256
-    0nf21bhclr2cwpflf733wn6hr6mcz94dr796jk91f0ck28nf7ab1 URL http://beta.quicklisp.org/archive/local-time/2017-01-24/local-time-20170124-git.tgz MD5
-    b345e5e74186eeddb85233df91d0dfe9 NAME local-time TESTNAME NIL FILENAME local-time DEPS ((NAME cl-fad)) DEPENDENCIES (cl-fad) VERSION 20170124-git SIBLINGS
+    0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p URL http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz MD5
+    b2f5b94458f34f4b73cdd614e1304a9a NAME local-time TESTNAME NIL FILENAME local-time DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS
     (cl-postgres+local-time local-time.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
new file mode 100644
index 000000000000..a8d9d94c6647
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lparallel'';
+  version = ''20160825-git'';
+
+  description = ''Parallelism for Common Lisp'';
+
+  deps = [ args."bordeaux-threads" args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz'';
+    sha256 = ''0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1'';
+  };
+    
+  packageName = "lparallel";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lparallel[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM lparallel DESCRIPTION Parallelism for Common Lisp SHA256 0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1 URL
+    http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz MD5 6393e8d0c0cc9ed1c88b6e7cca8de5df NAME lparallel TESTNAME NIL FILENAME
+    lparallel DEPS ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (bordeaux-threads alexandria) VERSION
+    20160825-git SIBLINGS (lparallel-bench lparallel-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index 473581c31841..51c8af197fc3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lquery'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
 
-  deps = [ args."plump" args."form-fiddle" args."clss" args."array-utils" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz'';
-    sha256 = ''1kqc0n4zh44yay9vbv6wirk3122q7if2999146lrgada5fy17r7x'';
+    url = ''http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz'';
+    sha256 = ''11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7'';
   };
+    
+  packageName = "lquery";
 
   overrides = x: {
     postInstall = ''
@@ -28,7 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 1kqc0n4zh44yay9vbv6wirk3122q7if2999146lrgada5fy17r7x URL
-    http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz MD5 072a796075862c96dcd6f227d79dc2b7 NAME lquery TESTNAME NIL FILENAME lquery
-    DEPS ((NAME plump) (NAME form-fiddle) (NAME clss) (NAME array-utils)) DEPENDENCIES (plump form-fiddle clss array-utils) VERSION 20160929-git SIBLINGS
-    (lquery-test)) */
+/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7 URL
+    http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz MD5 2190045b167685bfffdd01f5af9aa9a1 NAME lquery TESTNAME NIL FILENAME lquery
+    DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (lquery-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index ad159edc5c9d..b5c242530fe4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz'';
     sha256 = ''15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v'';
   };
+    
+  packageName = "map-set";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index cb5041b6029f..5729c898fdc6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz'';
     sha256 = ''0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d'';
   };
+    
+  packageName = "marshal";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index a24e9d99a2c5..1384799d242b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''md5'';
-  version = ''20150804-git'';
+  version = ''20170516-git'';
 
   description = ''The MD5 Message-Digest Algorithm RFC 1321'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz'';
-    sha256 = ''1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5'';
+    url = ''http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz'';
+    sha256 = ''1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv'';
   };
+    
+  packageName = "md5";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5 URL
-    http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz MD5 69331e0d326cbc3286ac447e2868e7fd NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL
-    DEPENDENCIES NIL VERSION 20150804-git SIBLINGS NIL) */
+/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv URL
+    http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz MD5 1c90df8ab2c6d57b7abaac84cae30ab3 NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL
+    DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index 708fa41ca51a..0bfbbbe14b2f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz'';
     sha256 = ''1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc'';
   };
+    
+  packageName = "metabang-bind";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
new file mode 100644
index 000000000000..1e35369a9d02
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''metatilities-base'';
+  version = ''20170403-git'';
+
+  description = ''These are metabang.com's Common Lisp basic utilities.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz'';
+    sha256 = ''14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br'';
+  };
+    
+  packageName = "metatilities-base";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/metatilities-base[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM metatilities-base DESCRIPTION These are metabang.com's Common Lisp basic utilities. SHA256 14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br URL
+    http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz MD5 8a3f429862a368e63b8fde731e9ab28a NAME
+    metatilities-base TESTNAME NIL FILENAME metatilities-base DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS (metatilities-base-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
new file mode 100644
index 000000000000..3586d5cc21b7
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''mssql'';
+  version = ''cl-20131003-git'';
+
+  description = '''';
+
+  deps = [ args."cffi" args."garbage-pools" args."iterate" args."parse-number" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-mssql/2013-10-03/cl-mssql-20131003-git.tgz'';
+    sha256 = ''1ykk8g4h3n21ich60l495v6h5pplx9hfs0kasz8myc5xv8ndljnk'';
+  };
+    
+  packageName = "mssql";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/mssql[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM mssql DESCRIPTION NIL SHA256 1ykk8g4h3n21ich60l495v6h5pplx9hfs0kasz8myc5xv8ndljnk URL
+    http://beta.quicklisp.org/archive/cl-mssql/2013-10-03/cl-mssql-20131003-git.tgz MD5 3e9d85a3b0ae7e000723a857ce7c2d44 NAME mssql TESTNAME NIL FILENAME mssql
+    DEPS ((NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools) (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number))
+    DEPENDENCIES (cffi garbage-pools iterate parse-number) VERSION cl-20131003-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index 186550a15df0..6580c322b04c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz'';
     sha256 = ''1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh'';
   };
+    
+  packageName = "myway";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256 1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh URL
     http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz MD5 6a16b41eb3216c469bfc8783cce08b01 NAME myway TESTNAME NIL FILENAME myway DEPS
-    ((NAME quri) (NAME map-set) (NAME cl-utilities) (NAME cl-ppcre) (NAME alexandria)) DEPENDENCIES (quri map-set cl-utilities cl-ppcre alexandria) VERSION
-    20150302-git SIBLINGS (myway-test)) */
+    ((NAME quri FILENAME quri) (NAME map-set FILENAME map-set) (NAME cl-utilities FILENAME cl-utilities) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (quri map-set cl-utilities cl-ppcre alexandria) VERSION 20150302-git SIBLINGS (myway-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index c952ab5a1f7e..53834f82431d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -12,6 +12,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz'';
     sha256 = ''1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45'';
   };
+    
+  packageName = "named-readtables";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index c5300698e540..622fd506b153 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz'';
     sha256 = ''0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4'';
   };
+    
+  packageName = "nibbles";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index 48bd3b7e542c..74cb02155eb7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz'';
     sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc'';
   };
+    
+  packageName = "optima";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM optima DESCRIPTION Optimized Pattern Matching Library SHA256 0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc URL
     http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz MD5 20523dc3dfc04bb2526008dff0842caa NAME optima TESTNAME NIL FILENAME optima
-    DEPS ((NAME closer-mop) (NAME alexandria)) DEPENDENCIES (closer-mop alexandria) VERSION 20150709-git SIBLINGS (optima.ppcre optima.test)) */
+    DEPS ((NAME closer-mop FILENAME closer-mop) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (closer-mop alexandria) VERSION 20150709-git SIBLINGS
+    (optima.ppcre optima.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index 56ae3473e2ce..b7398d3973d5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz'';
     sha256 = ''1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li'';
   };
+    
+  packageName = "parenscript";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM parenscript DESCRIPTION Lisp to JavaScript transpiler SHA256 1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li URL
     http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz MD5 dadecc13f2918bc618fb143e893deb99 NAME parenscript TESTNAME NIL FILENAME
-    parenscript DEPS ((NAME named-readtables) (NAME cl-ppcre) (NAME anaphora)) DEPENDENCIES (named-readtables cl-ppcre anaphora) VERSION Parenscript-2.6
-    SIBLINGS (parenscript.test)) */
+    parenscript DEPS ((NAME named-readtables FILENAME named-readtables) (NAME cl-ppcre FILENAME cl-ppcre) (NAME anaphora FILENAME anaphora)) DEPENDENCIES
+    (named-readtables cl-ppcre anaphora) VERSION Parenscript-2.6 SIBLINGS (parenscript.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
new file mode 100644
index 000000000000..726209f96178
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''parse-number'';
+  version = ''1.4'';
+
+  description = ''Number parsing library'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz'';
+    sha256 = ''0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh'';
+  };
+    
+  packageName = "parse-number";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/parse-number[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM parse-number DESCRIPTION Number parsing library SHA256 0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh URL
+    http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz MD5 f189d474a2cd063f9743b452241e59a9 NAME parse-number TESTNAME NIL FILENAME
+    parse-number DEPS NIL DEPENDENCIES NIL VERSION 1.4 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index dae0d011e752..f12f7b68d009 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
     sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
   };
+    
+  packageName = "pcall";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM pcall DESCRIPTION NIL SHA256 02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
     http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5 019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall TESTNAME NIL FILENAME pcall DEPS
-    ((NAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION 0.3 SIBLINGS (pcall-queue)) */
+    ((NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION 0.3 SIBLINGS (pcall-queue)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
new file mode 100644
index 000000000000..d5ef8606f495
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
@@ -0,0 +1,47 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''pgloader'';
+  version = ''3.3.2'';
+
+  description = ''Load data into PostgreSQL'';
+
+  deps = [ args."abnf" args."alexandria" args."cl-base64" args."cl-csv" args."cl-fad" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."command-line-arguments" args."db3" args."drakma" args."esrap" args."flexi-streams" args."ixf" args."local-time" args."lparallel" args."metabang-bind" args."mssql" args."postmodern" args."py-configparser" args."qmynd" args."quri" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."uiop" args."usocket" args."uuid" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/pgloader/2016-12-04/pgloader-3.3.2.tgz'';
+    sha256 = ''1riz76jvjlszic48lndwfxjn9i72251frivaqi10k61gjfbx03qv'';
+  };
+    
+  packageName = "pgloader";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/pgloader[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 1riz76jvjlszic48lndwfxjn9i72251frivaqi10k61gjfbx03qv URL
+    http://beta.quicklisp.org/archive/pgloader/2016-12-04/pgloader-3.3.2.tgz MD5 fb72ca0db46b80a74b7b31dc5b27e1b8 NAME pgloader TESTNAME NIL FILENAME pgloader
+    DEPS
+    ((NAME abnf FILENAME abnf) (NAME alexandria FILENAME alexandria) (NAME cl-base64 FILENAME cl-base64) (NAME cl-csv FILENAME cl-csv)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-log FILENAME cl-log) (NAME cl-markdown FILENAME cl-markdown) (NAME cl-postgres FILENAME cl-postgres)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME command-line-arguments FILENAME command-line-arguments) (NAME db3 FILENAME db3) (NAME drakma FILENAME drakma)
+     (NAME esrap FILENAME esrap) (NAME flexi-streams FILENAME flexi-streams) (NAME ixf FILENAME ixf) (NAME local-time FILENAME local-time)
+     (NAME lparallel FILENAME lparallel) (NAME metabang-bind FILENAME metabang-bind) (NAME mssql FILENAME mssql) (NAME postmodern FILENAME postmodern)
+     (NAME py-configparser FILENAME py-configparser) (NAME qmynd FILENAME qmynd) (NAME quri FILENAME quri) (NAME simple-date FILENAME simple-date)
+     (NAME split-sequence FILENAME split-sequence) (NAME sqlite FILENAME sqlite) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME uiop FILENAME uiop)
+     (NAME usocket FILENAME usocket) (NAME uuid FILENAME uuid))
+    DEPENDENCIES
+    (abnf alexandria cl-base64 cl-csv cl-fad cl-log cl-markdown cl-postgres cl-ppcre command-line-arguments db3 drakma esrap flexi-streams ixf local-time
+     lparallel metabang-bind mssql postmodern py-configparser qmynd quri simple-date split-sequence sqlite trivial-backtrace uiop usocket uuid)
+    VERSION 3.3.2 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 17795e3a92a1..d89e25f88190 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''plump'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz'';
-    sha256 = ''1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x'';
+    url = ''http://beta.quicklisp.org/archive/plump/2017-05-16/plump-20170516-git.tgz'';
+    sha256 = ''0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8'';
   };
+    
+  packageName = "plump";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x
-    URL http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz MD5 c49aeb37173aca79ee6ff5c89b0c4b1a NAME plump TESTNAME NIL FILENAME plump
-    DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS (plump-dom plump-lexer plump-parser)) */
+/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8
+    URL http://beta.quicklisp.org/archive/plump/2017-05-16/plump-20170516-git.tgz MD5 917a4f25691b3087ce24fd52ee42b4be NAME plump TESTNAME NIL FILENAME plump
+    DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (plump-dom plump-lexer plump-parser)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
new file mode 100644
index 000000000000..18dc40ff51ad
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''postmodern'';
+  version = ''20170403-git'';
+
+  description = ''PostgreSQL programming API'';
+
+  deps = [ args."closer-mop" args."bordeaux-threads" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
+    sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
+  };
+    
+  packageName = "postmodern";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/postmodern[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
+    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME postmodern TESTNAME NIL
+    FILENAME postmodern DEPS ((NAME closer-mop FILENAME closer-mop) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES
+    (closer-mop bordeaux-threads) VERSION 20170403-git SIBLINGS (cl-postgres s-sql simple-date)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index 9e4e2effbd32..142d24f5e48f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz'';
     sha256 = ''00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl'';
   };
+    
+  packageName = "proc-parse";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM proc-parse DESCRIPTION Procedural vector parser SHA256 00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl URL
     http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz MD5 5e43f50284fa70c448a3df12d1eea2ea NAME proc-parse TESTNAME NIL
-    FILENAME proc-parse DEPS ((NAME babel) (NAME alexandria)) DEPENDENCIES (babel alexandria) VERSION 20160318-git SIBLINGS (proc-parse-test)) */
+    FILENAME proc-parse DEPS ((NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (babel alexandria) VERSION 20160318-git SIBLINGS
+    (proc-parse-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index cf6fd03ba12e..ae823959fdcb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz'';
     sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl'';
   };
+    
+  packageName = "prove";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM prove DESCRIPTION NIL SHA256 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL
     http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz MD5 063b615692c8711d2392204ecf1b37b7 NAME prove TESTNAME NIL FILENAME prove DEPS
-    ((NAME uiop) (NAME cl-ppcre) (NAME cl-colors) (NAME cl-ansi-text) (NAME alexandria)) DEPENDENCIES (uiop cl-ppcre cl-colors cl-ansi-text alexandria) VERSION
-    20170403-git SIBLINGS (cl-test-more prove-asdf prove-test)) */
+    ((NAME uiop FILENAME uiop) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-colors FILENAME cl-colors) (NAME cl-ansi-text FILENAME cl-ansi-text)
+     (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (uiop cl-ppcre cl-colors cl-ansi-text alexandria) VERSION 20170403-git SIBLINGS (cl-test-more prove-asdf prove-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index fe48a580ee9b..9a7e24cebdc9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz'';
     sha256 = ''099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa'';
   };
+    
+  packageName = "puri";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
new file mode 100644
index 000000000000..868aae61f6bd
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''py-configparser'';
+  version = ''20131003-svn'';
+
+  description = ''Common Lisp implementation of the Python ConfigParser module'';
+
+  deps = [ args."parse-number" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/py-configparser/2013-10-03/py-configparser-20131003-svn.tgz'';
+    sha256 = ''10csqvl2acsha70igy75np2lf3bx7rrlrgryslsqay2xdzk6alwx'';
+  };
+    
+  packageName = "py-configparser";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/py-configparser[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM py-configparser DESCRIPTION Common Lisp implementation of the Python ConfigParser module SHA256 10csqvl2acsha70igy75np2lf3bx7rrlrgryslsqay2xdzk6alwx
+    URL http://beta.quicklisp.org/archive/py-configparser/2013-10-03/py-configparser-20131003-svn.tgz MD5 da697259b68f536bcb6b77933b55a5d9 NAME py-configparser
+    TESTNAME NIL FILENAME py-configparser DEPS ((NAME parse-number FILENAME parse-number)) DEPENDENCIES (parse-number) VERSION 20131003-svn SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
new file mode 100644
index 000000000000..b9871752e58d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
@@ -0,0 +1,38 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''qmynd'';
+  version = ''20160208-git'';
+
+  description = ''MySQL Native Driver'';
+
+  deps = [ args."usocket" args."trivial-gray-streams" args."salza2" args."list-of" args."ironclad" args."flexi-streams" args."cl+ssl" args."chipz" args."babel" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/qmynd/2016-02-08/qmynd-20160208-git.tgz'';
+    sha256 = ''0x9ml8id3s8l0rsa108bcs5lmyhb2y5a5p7s9ppvmqd4cgxnramq'';
+  };
+    
+  packageName = "qmynd";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/qmynd[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 0x9ml8id3s8l0rsa108bcs5lmyhb2y5a5p7s9ppvmqd4cgxnramq URL
+    http://beta.quicklisp.org/archive/qmynd/2016-02-08/qmynd-20160208-git.tgz MD5 9483ba5330a4240a9d5a8016c16a0084 NAME qmynd TESTNAME NIL FILENAME qmynd DEPS
+    ((NAME usocket FILENAME usocket) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME salza2 FILENAME salza2) (NAME list-of FILENAME list-of)
+     (NAME ironclad FILENAME ironclad) (NAME flexi-streams FILENAME flexi-streams) (NAME cl+ssl FILENAME cl+ssl) (NAME chipz FILENAME chipz)
+     (NAME babel FILENAME babel))
+    DEPENDENCIES (usocket trivial-gray-streams salza2 list-of ironclad flexi-streams cl+ssl chipz babel) VERSION 20160208-git SIBLINGS (qmynd-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 2a1219e48e71..1cfd62686c4c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz'';
     sha256 = ''0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a'';
   };
+    
+  packageName = "query-fs";
 
   overrides = x: {
     postInstall = ''
@@ -31,5 +33,7 @@ rec {
 /* (SYSTEM query-fs DESCRIPTION High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries SHA256
     0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a URL http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz MD5
     dfbb3d0e7b5d990488a17b184771d049 NAME query-fs TESTNAME NIL FILENAME query-fs DEPS
-    ((NAME bordeaux-threads) (NAME cl-fuse) (NAME cl-fuse-meta-fs) (NAME cl-ppcre) (NAME command-line-arguments) (NAME iterate) (NAME trivial-backtrace))
+    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fuse FILENAME cl-fuse) (NAME cl-fuse-meta-fs FILENAME cl-fuse-meta-fs)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME command-line-arguments FILENAME command-line-arguments) (NAME iterate FILENAME iterate)
+     (NAME trivial-backtrace FILENAME trivial-backtrace))
     DEPENDENCIES (bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace) VERSION 20160531-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index 1c351669c9a9..26fab0612e94 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz'';
     sha256 = ''14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv'';
   };
+    
+  packageName = "quri";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv URL
     http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz MD5 8c87e99d4f7308d83aab361a6e36508a NAME quri TESTNAME NIL FILENAME quri DEPS
-    ((NAME split-sequence) (NAME cl-utilities) (NAME babel) (NAME alexandria)) DEPENDENCIES (split-sequence cl-utilities babel alexandria) VERSION 20161204-git
-    SIBLINGS (quri-test)) */
+    ((NAME split-sequence FILENAME split-sequence) (NAME cl-utilities FILENAME cl-utilities) (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (split-sequence cl-utilities babel alexandria) VERSION 20161204-git SIBLINGS (quri-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 572cd29c75bb..e74c2c51b79e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz'';
     sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6'';
   };
+    
+  packageName = "rfc2388";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 38e9e4ecabd5..9654a86b74bf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -12,6 +12,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz'';
     sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va'';
   };
+    
+  packageName = "salza2";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
new file mode 100644
index 000000000000..00e2b3dbd0f9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''simple-date'';
+  version = ''postmodern-20170403-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
+    sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
+  };
+    
+  packageName = "simple-date";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/simple-date[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM simple-date DESCRIPTION NIL SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
+    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME simple-date TESTNAME NIL
+    FILENAME simple-date DEPS NIL DEPENDENCIES NIL VERSION postmodern-20170403-git SIBLINGS (cl-postgres postmodern s-sql)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 597f8fcfe3ad..9a04f3c64dba 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz'';
     sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s'';
   };
+    
+  packageName = "smart-buffer";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM smart-buffer DESCRIPTION Smart octets buffer SHA256 1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s URL
     http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz MD5 454d8510618da8111c7ca687549b7035 NAME smart-buffer TESTNAME NIL
-    FILENAME smart-buffer DEPS ((NAME xsubseq) (NAME uiop) (NAME flexi-streams)) DEPENDENCIES (xsubseq uiop flexi-streams) VERSION 20160628-git SIBLINGS
-    (smart-buffer-test)) */
+    FILENAME smart-buffer DEPS ((NAME xsubseq FILENAME xsubseq) (NAME uiop FILENAME uiop) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES
+    (xsubseq uiop flexi-streams) VERSION 20160628-git SIBLINGS (smart-buffer-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index 2712a1b8e1d4..03331578764c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -12,6 +12,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz'';
     sha256 = ''12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l'';
   };
+    
+  packageName = "split-sequence";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index 1d2f8fd01228..73144329206c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz'';
     sha256 = ''0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh'';
   };
+    
+  packageName = "sqlite";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM sqlite DESCRIPTION NIL SHA256 0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL
     http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite TESTNAME NIL FILENAME
-    sqlite DEPS ((NAME cffi) (NAME iterate)) DEPENDENCIES (cffi iterate) VERSION cl-20130615-git SIBLINGS NIL) */
+    sqlite DEPS ((NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate)) DEPENDENCIES (cffi iterate) VERSION cl-20130615-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index 1a7056e3fa2d..e06fe790f76c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz'';
     sha256 = ''0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g'';
   };
+    
+  packageName = "static-vectors";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM static-vectors DESCRIPTION Create vectors allocated in static memory. SHA256 0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g URL
     http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz MD5 fd3ebe4e79a71c49e32ac87d6a1bcaf4 NAME static-vectors TESTNAME NIL
-    FILENAME static-vectors DEPS ((NAME alexandria) (NAME cffi) (NAME cffi-grovel)) DEPENDENCIES (alexandria cffi cffi-grovel) VERSION v1.8.2 SIBLINGS NIL) */
+    FILENAME static-vectors DEPS ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)) DEPENDENCIES
+    (alexandria cffi cffi-grovel) VERSION v1.8.2 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index aaef5095dbba..6aa42000e73e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''stumpwm'';
-  version = ''20170403-git'';
+  version = ''20170516-git'';
 
   description = ''A tiling, keyboard driven window manager'';
 
-  deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stumpwm/2017-04-03/stumpwm-20170403-git.tgz'';
-    sha256 = ''1aca1nvdzp957mvwxz6x0plkg915l24mjf89h8rgkgclkn6xk4rf'';
+    url = ''http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz'';
+    sha256 = ''0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659'';
   };
+    
+  packageName = "stumpwm";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 1aca1nvdzp957mvwxz6x0plkg915l24mjf89h8rgkgclkn6xk4rf URL
-    http://beta.quicklisp.org/archive/stumpwm/2017-04-03/stumpwm-20170403-git.tgz MD5 1081021518c5b6c36d39f12c47305ea1 NAME stumpwm TESTNAME NIL FILENAME
-    stumpwm DEPS ((NAME alexandria) (NAME cl-ppcre) (NAME clx)) DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20170403-git SIBLINGS NIL) */
+/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659 URL
+    http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz MD5 ed076f733ef138aca3b04b3c3ff748f0 NAME stumpwm TESTNAME NIL FILENAME
+    stumpwm DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index 8ae38c456865..45d7a7800d50 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz'';
     sha256 = ''0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky'';
   };
+    
+  packageName = "swap-bytes";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM swap-bytes DESCRIPTION Optimized byte-swapping primitives. SHA256 0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky URL
     http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz MD5 dda8b3b0a4e345879e80a3cc398667bb NAME swap-bytes TESTNAME NIL FILENAME
-    swap-bytes DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION v1.1 SIBLINGS NIL) */
+    swap-bytes DEPS ((NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (trivial-features) VERSION v1.1 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index e28637849af1..0ed2e2887601 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz'';
     sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx'';
   };
+    
+  packageName = "trivial-backtrace";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 7b44cb903376..ea531d722d44 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz'';
     sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2'';
   };
+    
+  packageName = "trivial-features";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index 3c439aae2e4e..43bcd571304a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz'';
     sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08'';
   };
+    
+  packageName = "trivial-garbage";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 120f384a7a50..220119170228 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz'';
     sha256 = ''1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92'';
   };
+    
+  packageName = "trivial-gray-streams";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index d091ad3250fd..05631ab2b930 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-indent'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''A very simple library to allow indentation hints for SWANK.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-indent/2016-09-29/trivial-indent-20160929-git.tgz'';
-    sha256 = ''0nc7d5xdx4h8jvvqif7f721z8296kl6jk5hqmgr0mj3g7svgfrir'';
+    url = ''http://beta.quicklisp.org/archive/trivial-indent/2017-05-16/trivial-indent-20170516-git.tgz'';
+    sha256 = ''0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma'';
   };
+    
+  packageName = "trivial-indent";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 0nc7d5xdx4h8jvvqif7f721z8296kl6jk5hqmgr0mj3g7svgfrir
-    URL http://beta.quicklisp.org/archive/trivial-indent/2016-09-29/trivial-indent-20160929-git.tgz MD5 d93c0fa8e29d7d37170efd58b84ac188 NAME trivial-indent
-    TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL) */
+/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma
+    URL http://beta.quicklisp.org/archive/trivial-indent/2017-05-16/trivial-indent-20170516-git.tgz MD5 6c8bde35ec010645c8d585c272ae01e8 NAME trivial-indent
+    TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index e9d090a84aa1..f4a84b5ceef0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-mimes'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''Tiny library to detect mime types in files.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2016-09-29/trivial-mimes-20160929-git.tgz'';
-    sha256 = ''1sdsplngi3civv9wjd9rxxj3ynqc3260cfykpid5lpy8rhbyiw0w'';
+    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz'';
+    sha256 = ''1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2'';
   };
+    
+  packageName = "trivial-mimes";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 1sdsplngi3civv9wjd9rxxj3ynqc3260cfykpid5lpy8rhbyiw0w URL
-    http://beta.quicklisp.org/archive/trivial-mimes/2016-09-29/trivial-mimes-20160929-git.tgz MD5 1075218aae1940bb3413b0edb6b73ac2 NAME trivial-mimes TESTNAME
-    NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL) */
+/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2 URL
+    http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz MD5 b9cbba4147647ded4042949db3c00f1e NAME trivial-mimes TESTNAME
+    NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 064e67fef50f..8aed5e9681cd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz'';
     sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx'';
   };
+    
+  packageName = "trivial-types";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index d7a8721f2986..efbdca21465c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz'';
     sha256 = ''1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb'';
   };
+    
+  packageName = "trivial-utf-8";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index f3528d605246..78085ff17629 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz'';
     sha256 = ''1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy'';
   };
+    
+  packageName = "uffi";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index 3b340be7c1d5..579ad469cda9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''uiop'';
-  version = ''3.2.0'';
+  version = ''3.2.1'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz'';
-    sha256 = ''1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig'';
+    url = ''http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz'';
+    sha256 = ''1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v'';
   };
+    
+  packageName = "uiop";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM uiop DESCRIPTION NIL SHA256 1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig URL
-    http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz MD5 3c304efce790959b14a241db2e669fce NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL
-    DEPENDENCIES NIL VERSION 3.2.0 SIBLINGS (asdf-driver)) */
+/* (SYSTEM uiop DESCRIPTION NIL SHA256 1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v URL
+    http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz MD5 3e9ef02ecf9005240b66552d85719700 NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL
+    DEPENDENCIES NIL VERSION 3.2.1 SIBLINGS (asdf-driver)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index 5b6a7fafd015..c071b2f3bbde 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz'';
     sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2'';
   };
+    
+  packageName = "usocket";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256 1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2 URL
     http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz MD5 1dcb027187679211f9d277ce99ca2a5a NAME usocket TESTNAME NIL FILENAME usocket
-    DEPS ((NAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)) */
+    DEPS ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
new file mode 100644
index 000000000000..1f415f7142ac
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''uuid'';
+  version = ''20130813-git'';
+
+  description = ''UUID Generation'';
+
+  deps = [ args."ironclad" args."trivial-utf-8" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz'';
+    sha256 = ''1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf'';
+  };
+    
+  packageName = "uuid";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uuid[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM uuid DESCRIPTION UUID Generation SHA256 1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf URL
+    http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz MD5 e9029d9437573ec2ffa2b474adf95daf NAME uuid TESTNAME NIL FILENAME uuid DEPS
+    ((NAME ironclad FILENAME ironclad) (NAME trivial-utf-8 FILENAME trivial-utf-8)) DEPENDENCIES (ironclad trivial-utf-8) VERSION 20130813-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index ca9680ebd00e..7be98029ca21 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz'';
     sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93'';
   };
+    
+  packageName = "vom";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index a225b323f36f..086a374d6e7b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz'';
     sha256 = ''0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1'';
   };
+    
+  packageName = "woo";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 3744526b25ae..46262fb78f43 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz'';
     sha256 = ''0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0'';
   };
+    
+  packageName = "wookie";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index 11fa1931f0b9..4d1d902cf5c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz'';
     sha256 = ''1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b'';
   };
+    
+  packageName = "xmls";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index da2611d1f39f..c1c699bd3629 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz'';
     sha256 = ''0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q'';
   };
+    
+  packageName = "xsubseq";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index 32c7198b99f8..d581891c7cc8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz'';
     sha256 = ''00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk'';
   };
+    
+  packageName = "yason";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM yason DESCRIPTION JSON parser/encoder SHA256 00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk URL
     http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz MD5 79de5d242c5e9ce49dfda153d5f442ec NAME yason TESTNAME NIL FILENAME yason DEPS
-    ((NAME alexandria) (NAME trivial-gray-streams)) DEPENDENCIES (alexandria trivial-gray-streams) VERSION v0.7.6 SIBLINGS NIL) */
+    ((NAME alexandria FILENAME alexandria) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria trivial-gray-streams) VERSION
+    v0.7.6 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 06fc8502d6ce..0a1a9ee2f818 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz'';
     sha256 = ''1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6'';
   };
+    
+  packageName = "zpb-ttf";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 2725c354d35b..7065555cedd8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -16,6 +16,9 @@ in
         export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh";
       '';
     };
+    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [
+      alexandria cl-ppcre clx
+    ]);
   };
   iterate = skipBuildPhase;
   cl-fuse = x: {
@@ -33,13 +36,12 @@ in
   };
   hunchentoot = addNativeLibs [pkgs.openssl];
   iolib = x: {
-    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" "iolib/pathnames"
-    ];
+    propagatedBuildInputs = (x.propagatedBuildInputs or [])
+     ++ (with pkgs; [libfixposix gcc])
+     ++ (with qlnp; [
+       alexandria split-sequence cffi bordeaux-threads idna swap-bytes
+     ])
+     ;
   };
   cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]);
   clack =  addDeps (with qlnp;[lack bordeaux-threads prove]);
@@ -110,6 +112,7 @@ in
   cffi = multiOverride [(addNativeLibs [pkgs.libffi])
     (addDeps (with qlnp; [uffi uiop trivial-features]))];
   cl-vectors = addDeps (with qlnp; [zpb-ttf]);
+  cl-paths-ttf = addDeps (with qlnp; [zpb-ttf]);
   "3bmd" = addDeps (with qlnp; [esrap split-sequence]);
   cl-dbi = addDeps (with qlnp; [
     cl-syntax cl-syntax-annot split-sequence closer-mop bordeaux-threads
@@ -124,13 +127,17 @@ in
         ln -s lib-dependent/*.asd .
       '';
     };
+    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [
+      cl-ppcre
+    ]);
   };
   cl-unification = addDeps (with qlnp; [cl-ppcre]);
   cl-syntax-annot = addDeps (with qlnp; [cl-syntax]);
   cl-syntax-anonfun = addDeps (with qlnp; [cl-syntax]);
   cl-syntax-markup = addDeps (with qlnp; [cl-syntax]);
   cl-test-more = addDeps (with qlnp; [prove]);
-  babel-streams = addDeps (with qlnp; [babel]);
+  babel-streams = addDeps (with qlnp; [babel trivial-gray-streams]);
+  babel = addDeps (with qlnp; [trivial-features alexandria]);
   plump = addDeps (with qlnp; [array-utils trivial-indent]);
   sqlite = addNativeLibs [pkgs.sqlite];
   uiop = x: {
@@ -143,4 +150,33 @@ in
       '';
     };
   };
+  cl-containers = x: {
+    overrides = y: (x.overrides y) // {
+      postConfigure = "rm GNUmakefile";
+    };
+  };
+  esrap = addDeps (with qlnp; [alexandria]);
+  fast-io = addDeps (with qlnp; [
+    alexandria trivial-gray-streams static-vectors
+  ]);
+  hu_dot_dwim_dot_def = addDeps (with qlnp; [
+    hu_dot_dwim_dot_asdf alexandria anaphora iterate metabang-bind
+  ]);
+  ironclad = addDeps (with qlnp; [nibbles flexi-streams]);
+  ixf = addDeps (with qlnp; [
+    split-sequence md5 alexandria babel local-time cl-ppcre ieee-floats
+  ]);
+  jonathan = addDeps (with qlnp; [
+    cl-syntax cl-syntax-annot fast-io proc-parse cl-ppcre
+  ]);
+  local-time = addDeps (with qlnp; [cl-fad]);
+  lquery = addDeps (with qlnp; [array-utils form-fiddle plump clss]);
+  clss = addDeps (with qlnp; [array-utils plump]);
+  form-fiddle = addDeps (with qlnp; [documentation-utils]);
+  documentation-utils = addDeps (with qlnp; [trivial-indent]);
+  mssql = x: {
+    testSystems = [];
+  };
+  cl-postgres = addDeps (with qlnp; [cl-ppcre md5]);
+  postmodern = addDeps (with qlnp; [md5]);
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 3d15319ad06f..74946f07f076 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -1,5 +1,6 @@
 3bmd
 alexandria
+array-utils
 babel
 blackbird
 bordeaux-threads
@@ -31,6 +32,7 @@ cl-ppcre-unicode
 cl-reexport
 cl-smtp
 clsql
+clss
 cl+ssl
 cl-syntax-annot
 cl-syntax-anonfun
@@ -50,15 +52,20 @@ dbd-mysql
 dbd-postgres
 dbd-sqlite3
 dexador
+documentation-utils
 drakma
 esrap
 external-program
 fast-http
 fast-io
 flexi-streams
+form-fiddle
 http-body
+hu.dwim.asdf
 hu.dwim.def
 hunchentoot
+idna
+ieee-floats
 iolib
 ironclad
 iterate
@@ -67,9 +74,11 @@ lev
 local-time
 lquery
 marshal
+nibbles
 optima
 parenscript
 pcall
+pgloader
 plump
 proc-parse
 prove
@@ -80,7 +89,9 @@ smart-buffer
 split-sequence
 static-vectors
 stumpwm
+swap-bytes
 trivial-backtrace
+trivial-indent
 trivial-mimes
 trivial-types
 trivial-utf-8
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 118045015e2d..c87b827112c2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,10 +6,10 @@ let quicklisp-to-nix-packages = rec {
   buildLispPackage = callPackage ./define-package.nix;
   qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
 
-  "trivial-indent" = buildLispPackage
+  "asdf-system-connections" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."trivial-indent" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-indent.nix {
+       (qlOverrides."asdf-system-connections" or (x: {}))
+       (import ./quicklisp-to-nix-output/asdf-system-connections.nix {
          inherit fetchurl;
        }));
 
@@ -24,12 +24,63 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "documentation-utils" = buildLispPackage
+  "list-of" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."documentation-utils" or (x: {}))
-       (import ./quicklisp-to-nix-output/documentation-utils.nix {
+       (qlOverrides."list-of" or (x: {}))
+       (import ./quicklisp-to-nix-output/list-of.nix {
          inherit fetchurl;
-           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
+       }));
+
+
+  "parse-number" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."parse-number" or (x: {}))
+       (import ./quicklisp-to-nix-output/parse-number.nix {
+         inherit fetchurl;
+       }));
+
+
+  "garbage-pools" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."garbage-pools" or (x: {}))
+       (import ./quicklisp-to-nix-output/garbage-pools.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-containers" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-containers" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-containers.nix {
+         inherit fetchurl;
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
+           "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections";
+       }));
+
+
+  "dynamic-classes" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."dynamic-classes" or (x: {}))
+       (import ./quicklisp-to-nix-output/dynamic-classes.nix {
+         inherit fetchurl;
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
+       }));
+
+
+  "metatilities-base" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."metatilities-base" or (x: {}))
+       (import ./quicklisp-to-nix-output/metatilities-base.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-interpol" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-interpol" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-interpol.nix {
+         inherit fetchurl;
+           "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
        }));
 
 
@@ -49,8 +100,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."babel-streams" or (x: {}))
        (import ./quicklisp-to-nix-output/babel-streams.nix {
          inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -72,6 +121,141 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "uuid" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."uuid" or (x: {}))
+       (import ./quicklisp-to-nix-output/uuid.nix {
+         inherit fetchurl;
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
+       }));
+
+
+  "simple-date" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."simple-date" or (x: {}))
+       (import ./quicklisp-to-nix-output/simple-date.nix {
+         inherit fetchurl;
+       }));
+
+
+  "qmynd" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."qmynd" or (x: {}))
+       (import ./quicklisp-to-nix-output/qmynd.nix {
+         inherit fetchurl;
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "salza2" = quicklisp-to-nix-packages."salza2";
+           "list-of" = quicklisp-to-nix-packages."list-of";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "babel" = quicklisp-to-nix-packages."babel";
+       }));
+
+
+  "py-configparser" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."py-configparser" or (x: {}))
+       (import ./quicklisp-to-nix-output/py-configparser.nix {
+         inherit fetchurl;
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
+       }));
+
+
+  "postmodern" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."postmodern" or (x: {}))
+       (import ./quicklisp-to-nix-output/postmodern.nix {
+         inherit fetchurl;
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+       }));
+
+
+  "mssql" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."mssql" or (x: {}))
+       (import ./quicklisp-to-nix-output/mssql.nix {
+         inherit fetchurl;
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "garbage-pools" = quicklisp-to-nix-packages."garbage-pools";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
+       }));
+
+
+  "lparallel" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lparallel" or (x: {}))
+       (import ./quicklisp-to-nix-output/lparallel.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "ixf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."ixf" or (x: {}))
+       (import ./quicklisp-to-nix-output/ixf.nix {
+         inherit fetchurl;
+       }));
+
+
+  "db3" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."db3" or (x: {}))
+       (import ./quicklisp-to-nix-output/db3.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-markdown" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-markdown" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-markdown.nix {
+         inherit fetchurl;
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
+           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+           "dynamic-classes" = quicklisp-to-nix-packages."dynamic-classes";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-containers" = quicklisp-to-nix-packages."cl-containers";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+       }));
+
+
+  "cl-log" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-log" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-log.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-csv" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-csv" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-csv.nix {
+         inherit fetchurl;
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "abnf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."abnf" or (x: {}))
+       (import ./quicklisp-to-nix-output/abnf.nix {
+         inherit fetchurl;
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "esrap" = quicklisp-to-nix-packages."esrap";
+       }));
+
+
   "named-readtables" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."named-readtables" or (x: {}))
@@ -80,59 +264,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "array-utils" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."array-utils" or (x: {}))
-       (import ./quicklisp-to-nix-output/array-utils.nix {
-         inherit fetchurl;
-       }));
-
-
-  "clss" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clss" or (x: {}))
-       (import ./quicklisp-to-nix-output/clss.nix {
-         inherit fetchurl;
-           "array-utils" = quicklisp-to-nix-packages."array-utils";
-           "plump" = quicklisp-to-nix-packages."plump";
-       }));
-
-
-  "form-fiddle" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."form-fiddle" or (x: {}))
-       (import ./quicklisp-to-nix-output/form-fiddle.nix {
-         inherit fetchurl;
-           "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
-       }));
-
-
-  "nibbles" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."nibbles" or (x: {}))
-       (import ./quicklisp-to-nix-output/nibbles.nix {
-         inherit fetchurl;
-       }));
-
-
-  "swap-bytes" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."swap-bytes" or (x: {}))
-       (import ./quicklisp-to-nix-output/swap-bytes.nix {
-         inherit fetchurl;
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-       }));
-
-
-  "idna" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."idna" or (x: {}))
-       (import ./quicklisp-to-nix-output/idna.nix {
-         inherit fetchurl;
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-       }));
-
-
   "rfc2388" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."rfc2388" or (x: {}))
@@ -149,35 +280,10 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "hu.dwim.asdf" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."hu.dwim.asdf" or (x: {}))
-       (import ./quicklisp-to-nix-output/hu.dwim.asdf.nix {
-         inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-
-
   "jonathan" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."jonathan" or (x: {}))
        (import ./quicklisp-to-nix-output/jonathan.nix {
-         inherit fetchurl;
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
-           "babel" = quicklisp-to-nix-packages."babel";
-       }));
-
-
-  "puri" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."puri" or (x: {}))
-       (import ./quicklisp-to-nix-output/puri.nix {
          inherit fetchurl;
        }));
 
@@ -191,6 +297,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "puri" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."puri" or (x: {}))
+       (import ./quicklisp-to-nix-output/puri.nix {
+         inherit fetchurl;
+       }));
+
+
   "sqlite" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."sqlite" or (x: {}))
@@ -260,7 +374,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-paths-ttf" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-paths-ttf.nix {
          inherit fetchurl;
-           "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
        }));
 
 
@@ -372,24 +485,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "lack-middleware-backtrace" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lack-middleware-backtrace" or (x: {}))
-       (import ./quicklisp-to-nix-output/lack-middleware-backtrace.nix {
-         inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-
-
-  "lack-util" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lack-util" or (x: {}))
-       (import ./quicklisp-to-nix-output/lack-util.nix {
-         inherit fetchurl;
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-       }));
-
-
   "trivial-gray-streams" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-gray-streams" or (x: {}))
@@ -398,6 +493,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "trivial-features" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-features" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-features.nix {
+         inherit fetchurl;
+       }));
+
+
   "uiop" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."uiop" or (x: {}))
@@ -468,14 +571,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "trivial-features" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."trivial-features" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-features.nix {
-         inherit fetchurl;
-       }));
-
-
   "yason" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."yason" or (x: {}))
@@ -551,6 +646,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "trivial-indent" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-indent" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-indent.nix {
+         inherit fetchurl;
+       }));
+
+
   "trivial-backtrace" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-backtrace" or (x: {}))
@@ -559,14 +662,20 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "swap-bytes" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."swap-bytes" or (x: {}))
+       (import ./quicklisp-to-nix-output/swap-bytes.nix {
+         inherit fetchurl;
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+       }));
+
+
   "stumpwm" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."stumpwm" or (x: {}))
        (import ./quicklisp-to-nix-output/stumpwm.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "clx" = quicklisp-to-nix-packages."clx";
        }));
 
 
@@ -666,6 +775,44 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "pgloader" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."pgloader" or (x: {}))
+       (import ./quicklisp-to-nix-output/pgloader.nix {
+         inherit fetchurl;
+           "abnf" = quicklisp-to-nix-packages."abnf";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-csv" = quicklisp-to-nix-packages."cl-csv";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-log" = quicklisp-to-nix-packages."cl-log";
+           "cl-markdown" = quicklisp-to-nix-packages."cl-markdown";
+           "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "command-line-arguments" = quicklisp-to-nix-packages."command-line-arguments";
+           "db3" = quicklisp-to-nix-packages."db3";
+           "drakma" = quicklisp-to-nix-packages."drakma";
+           "esrap" = quicklisp-to-nix-packages."esrap";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "ixf" = quicklisp-to-nix-packages."ixf";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "lparallel" = quicklisp-to-nix-packages."lparallel";
+           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+           "mssql" = quicklisp-to-nix-packages."mssql";
+           "postmodern" = quicklisp-to-nix-packages."postmodern";
+           "py-configparser" = quicklisp-to-nix-packages."py-configparser";
+           "qmynd" = quicklisp-to-nix-packages."qmynd";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "simple-date" = quicklisp-to-nix-packages."simple-date";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "sqlite" = quicklisp-to-nix-packages."sqlite";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "uuid" = quicklisp-to-nix-packages."uuid";
+       }));
+
+
   "pcall" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."pcall" or (x: {}))
@@ -696,6 +843,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "nibbles" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."nibbles" or (x: {}))
+       (import ./quicklisp-to-nix-output/nibbles.nix {
+         inherit fetchurl;
+       }));
+
+
   "marshal" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."marshal" or (x: {}))
@@ -709,10 +864,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."lquery" or (x: {}))
        (import ./quicklisp-to-nix-output/lquery.nix {
          inherit fetchurl;
-           "plump" = quicklisp-to-nix-packages."plump";
-           "form-fiddle" = quicklisp-to-nix-packages."form-fiddle";
-           "clss" = quicklisp-to-nix-packages."clss";
-           "array-utils" = quicklisp-to-nix-packages."array-utils";
        }));
 
 
@@ -721,7 +872,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."local-time" or (x: {}))
        (import ./quicklisp-to-nix-output/local-time.nix {
          inherit fetchurl;
-           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
        }));
 
 
@@ -755,7 +905,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."ironclad" or (x: {}))
        (import ./quicklisp-to-nix-output/ironclad.nix {
          inherit fetchurl;
-           "nibbles" = quicklisp-to-nix-packages."nibbles";
        }));
 
 
@@ -764,15 +913,23 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."iolib" or (x: {}))
        (import ./quicklisp-to-nix-output/iolib.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "idna" = quicklisp-to-nix-packages."idna";
+       }));
+
+
+  "ieee-floats" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."ieee-floats" or (x: {}))
+       (import ./quicklisp-to-nix-output/ieee-floats.nix {
+         inherit fetchurl;
+       }));
+
+
+  "idna" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."idna" or (x: {}))
+       (import ./quicklisp-to-nix-output/idna.nix {
+         inherit fetchurl;
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
@@ -795,16 +952,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "hu.dwim.def" = buildLispPackage
+  "hu_dot_dwim_dot_def" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."hu.dwim.def" or (x: {}))
-       (import ./quicklisp-to-nix-output/hu.dwim.def.nix {
+       (qlOverrides."hu_dot_dwim_dot_def" or (x: {}))
+       (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix {
+         inherit fetchurl;
+       }));
+
+
+  "hu_dot_dwim_dot_asdf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."hu_dot_dwim_dot_asdf" or (x: {}))
+       (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix {
          inherit fetchurl;
-           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
-           "iterate" = quicklisp-to-nix-packages."iterate";
-           "hu.dwim.asdf" = quicklisp-to-nix-packages."hu.dwim.asdf";
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -824,6 +984,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "form-fiddle" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."form-fiddle" or (x: {}))
+       (import ./quicklisp-to-nix-output/form-fiddle.nix {
+         inherit fetchurl;
+       }));
+
+
   "flexi-streams" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."flexi-streams" or (x: {}))
@@ -838,9 +1006,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."fast-io" or (x: {}))
        (import ./quicklisp-to-nix-output/fast-io.nix {
          inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -866,7 +1031,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."esrap" or (x: {}))
        (import ./quicklisp-to-nix-output/esrap.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -886,27 +1050,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "documentation-utils" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."documentation-utils" or (x: {}))
+       (import ./quicklisp-to-nix-output/documentation-utils.nix {
+         inherit fetchurl;
+       }));
+
+
   "dexador" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."dexador" or (x: {}))
        (import ./quicklisp-to-nix-output/dexador.nix {
          inherit fetchurl;
-           "usocket" = quicklisp-to-nix-packages."usocket";
-           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
-           "fast-http" = quicklisp-to-nix-packages."fast-http";
-           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
-           "chunga" = quicklisp-to-nix-packages."chunga";
-           "chipz" = quicklisp-to-nix-packages."chipz";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1085,6 +1241,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "clss" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clss" or (x: {}))
+       (import ./quicklisp-to-nix-output/clss.nix {
+         inherit fetchurl;
+       }));
+
+
   "clsql" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clsql" or (x: {}))
@@ -1130,7 +1294,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-ppcre-template" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-ppcre-template.nix {
          inherit fetchurl;
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
        }));
 
 
@@ -1323,24 +1486,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clack-v1-compat" or (x: {}))
        (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
-           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "marshal" = quicklisp-to-nix-packages."marshal";
-           "local-time" = quicklisp-to-nix-packages."local-time";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "http-body" = quicklisp-to-nix-packages."http-body";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "circular-streams" = quicklisp-to-nix-packages."circular-streams";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1349,12 +1494,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clack" or (x: {}))
        (import ./quicklisp-to-nix-output/clack.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1429,8 +1568,14 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."babel" or (x: {}))
        (import ./quicklisp-to-nix-output/babel.nix {
          inherit fetchurl;
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "array-utils" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."array-utils" or (x: {}))
+       (import ./quicklisp-to-nix-output/array-utils.nix {
+         inherit fetchurl;
        }));
 
 
@@ -1442,10 +1587,10 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "3bmd" = buildLispPackage
+  "_3bmd" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."3bmd" or (x: {}))
-       (import ./quicklisp-to-nix-output/3bmd.nix {
+       (qlOverrides."_3bmd" or (x: {}))
+       (import ./quicklisp-to-nix-output/_3bmd.nix {
          inherit fetchurl;
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "esrap" = quicklisp-to-nix-packages."esrap";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
index a13cedf3dfe4..3a0c5cb5fc2c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
@@ -1,8 +1,7 @@
-  "<% @var name %>" = buildLispPackage
+  "<% @var filename %>" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."<% @var name %>" or (x: {}))
+       (qlOverrides."<% @var filename %>" or (x: {}))
        (import ./quicklisp-to-nix-output/<% @var filename %>.nix {
          inherit fetchurl;<% @loop deps %>
-           "<% @var name %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endloop %>
-       }));<% @ifequal name filename %><% @else %>
-  "<% @var filename %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endif %>
+           "<% @var filename %>" = quicklisp-to-nix-packages."<% @var filename %>";<% @endloop %>
+       }));
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
index 3b71ade03f7c..baedbd1553a5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
@@ -7,12 +7,14 @@ rec {
 
   description = ''<% @var description %>'';
 
-  deps = [ <% @loop deps %>args."<% @var name %>" <% @endloop %>];
+  deps = [ <% @loop deps %>args."<% @var filename %>" <% @endloop %>];
 
   src = fetchurl {
     url = ''<% @var url %>'';
     sha256 = ''<% @var sha256 %>'';
   };
+    
+  packageName = "<% @var name %>";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
index 18cf6d097a21..141fb0f34ebb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
@@ -36,19 +36,27 @@
                        (map 'list 'identity (md5:md5sum-file path))))))))
 
 (defun escape-filename (s)
-  (format nil "~{~a~}"
-       (loop
-         for x in (map 'list 'identity s)
-         collect
-         (case x
-           (#\/ "_slash_")
-           (#\\ "_backslash_")
-           (#\_ "__")
-           (t x)))))
+  (format 
+    nil "~a~{~a~}"
+    (if (cl-ppcre:scan "^[a-zA-Z_]" s) "" "_")
+    (loop
+      for x in (map 'list 'identity s)
+      collect
+      (case x
+        (#\/ "_slash_")
+        (#\\ "_backslash_")
+        (#\_ "__")
+        (#\. "_dot_")
+        (t x)))))
 
 (defun system-data (system)
   (let*
-    ((asdf-system (asdf:find-system system))
+    ((asdf-system
+       (or
+         (ignore-errors (asdf:find-system system))
+         (progn
+           (ql:quickload system)
+           (asdf:find-system system))))
      (ql-system (ql-dist:find-system system))
      (ql-release (ql-dist:release ql-system))
      (ql-sibling-systems (ql-dist:provided-systems ql-release))
@@ -73,7 +81,8 @@
            :test 'equal)
          ql-sibling-names
          :test 'equal))
-     (deps (mapcar (lambda (x) (list :name x)) dependencies))
+     (deps (mapcar (lambda (x) (list :name x :filename (escape-filename x)))
+                   dependencies))
      (description (asdf:system-description asdf-system))
      (release-name (ql-dist:short-description ql-release))
      (version (cl-ppcre:regex-replace-all