From 02f58311ec8f2ac376beaf6ef79f3ecad6ac1a15 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 31 Mar 2017 12:06:05 +0200
Subject: [PATCH] lispPackages: migrate to quicklispPackages where possible

---
 .../lisp-modules/lisp-packages.nix            | 549 +-----------------
 .../quicklisp-to-nix-output/cl-aa.nix         |  21 +
 .../cl-fuse-meta-fs.nix                       |  21 +
 .../quicklisp-to-nix-output/cl-paths-ttf.nix  |  21 +
 .../quicklisp-to-nix-output/cl-paths.nix      |  21 +
 .../quicklisp-to-nix-output/cl-smtp.nix       |  21 +
 .../quicklisp-to-nix-output/cl-store.nix      |  21 +
 .../cl-unification.nix                        |  23 +
 .../quicklisp-to-nix-output/cl-vectors.nix    |  21 +
 .../quicklisp-to-nix-output/clsql.nix         |  21 +
 .../quicklisp-to-nix-output/clx-truetype.nix  |  21 +
 .../command-line-arguments.nix                |  21 +
 .../quicklisp-to-nix-output/pcall-queue.nix   |  21 +
 .../quicklisp-to-nix-output/pcall.nix         |  21 +
 .../quicklisp-to-nix-output/query-fs.nix      |  21 +
 .../quicklisp-to-nix-output/uffi.nix          |  21 +
 .../quicklisp-to-nix-output/zpb-ttf.nix       |  21 +
 .../quicklisp-to-nix-overrides.nix            |  23 +
 .../lisp-modules/quicklisp-to-nix-systems.txt |   8 +
 .../lisp-modules/quicklisp-to-nix.nix         | 204 ++++++-
 pkgs/top-level/all-packages.nix               |   5 +-
 21 files changed, 555 insertions(+), 572 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 537e754d57aa..70234d385a60 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -6,63 +6,11 @@ let lispPackages = rec {
 
   buildLispPackage =  callPackage ./define-package.nix;
 
-  cl-ppcre = buildLispPackage rec {
-    baseName = "cl-ppcre";
-    version = "2.0.4";
-    description = "Regular expression library for Common Lisp";
-    deps = [];
-    src = pkgs.fetchurl {
-      url = "https://github.com/edicl/cl-ppcre/archive/v${version}.tar.gz";
-      sha256 = "16nkfg6j7nn8qkzxn462kqpdlbajpz2p55pdl12sia6yqkj3lh97";
-    };
-  };
-
-  clx = buildLispPackage rec {
-    baseName = "clx";
-    version = "git-20170201";
-    description = "An implementation of the X Window System protocol in Lisp";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/sharplispers/clx'';
-      sha256 = "08jw4d2sx49kq1xw44s3fvyq94wm1if4v1jbf1137fvlkzw1pf5m";
-      rev = ''c6d2446a10abd9eade2c52342b9662c9dd8579dc'';
-      name = "clx-git-checkout-${version}";
-    };
-  };
-
-  iterate = buildLispPackage rec {
-    baseName = "iterate";
-    version = "darcs-2014-11-01";
-    description = "Iteration package for Common Lisp";
-    deps = [];
-    src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs {
-      url = "https://common-lisp.net/project/iterate/darcs/iterate";
-      sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25";
-      context = ./iterate.darcs-context;
-    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";}));
-    overrides = x: {
-      configurePhase="buildPhase(){ true; }";
-    };
-  };
-
-  alexandria = buildLispPackage rec {
-    baseName = "alexandria";
-    version = "git-20131029";
-    description = "A collection of portable public domain utilities";
-    deps = [];
-    src = pkgs.fetchgit {
-      url = "https://gitlab.common-lisp.net/alexandria/alexandria.git";
-      sha256 = "1gx642w00cnnkbkcsnzmg1w147r6yvc0ayns7ha4k0qcvfnb1zvs";
-      rev = ''2b1eb4067fb34bc501e527de75d09166a8ba9ceb'';
-    };
-  };
-
   esrap-peg = buildLispPackage rec {
     baseName = "esrap-peg";
     version = "git-20131029";
     description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions";
-    deps = [alexandria cl-unification esrap iterate];
+    deps = with pkgs.quicklispPackages; [alexandria cl-unification esrap iterate];
     src = pkgs.fetchgit {
       url = "https://github.com/fb08af68/esrap-peg.git";
       sha256 = "48e616a697aca95e90e55052fdc9a7f96bf29b3208b1b4012fcd3189c2eceeb1";
@@ -70,503 +18,11 @@ let lispPackages = rec {
     };
   };
 
-  cl-unification = buildLispPackage rec {
-    baseName = "cl-unification";
-    version = "git-2015-07-01";
-    description = "";
-    deps = [];
-    src = pkgs.fetchgit {
-      url = "https://gitlab.common-lisp.net/cl-unification/cl-unification.git";
-      sha256 = "0b7yik1ma7ciwscald624325dl6265fbq52iwy6jh46nvv085dqk";
-      rev = ''283c94d38d11c806a1fc9db022f0b54dced93bab'';
-    };
-  };
-
-  esrap = buildLispPackage rec {
-    baseName = "esrap";
-    version = "git-20131029";
-    description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp";
-    deps = [alexandria];
-    src = pkgs.fetchgit {
-      url = "https://github.com/scymtym/esrap.git";
-      sha256 = "175jsv309yir0yi03aa2995xg84zjgk34kgnbql5l4vy4as5x665";
-      rev = ''c71933b84e220f21e8a509ec26afe3e3871e2e26'';
-    };
-  };
-
-  clx-truetype = buildLispPackage rec {
-    baseName = "clx-truetype";
-    version = "git-20141112";
-    description = "A pure Common Lisp solution for antialiased TrueType font rendering using CLX and the XRender extension";
-    deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/filonenko-mikhail/clx-truetype'';
-      sha256 = "14wx9s1fd56l25ms2ns1w9a5rxgqr00vgw6jdarfkqk7mfrxxzs1";
-      rev = ''6f72905c6886a656e5a1c8167097f12375c6da7d'';
-    };
-    overrides = x:{
-      configurePhase = "rm Makefile";
-    };
-  };
-
-  cl-fad = buildLispPackage rec {
-    baseName = "cl-fad";
-    version = "v0.7.2";
-    description = "Portable pathname library";
-    deps = [alexandria bordeaux-threads];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/edicl/cl-fad'';
-      sha256 = "87917ab4af4f713ad41faa72c7eaed2872f8dac47f49c0668ba8782590fdbca4";
-      rev = ''refs/tags/v0.7.2'';
-    };
-  };
-
-  bordeaux-threads = buildLispPackage rec {
-    baseName = "bordeaux-threads";
-    version = "0.8.3";
-    description = "Bordeaux Threads makes writing portable multi-threaded apps simple";
-    deps = [alexandria];
-    # Source type: http
-    src = pkgs.fetchurl {
-      url = ''http://common-lisp.net/project/bordeaux-threads/releases/bordeaux-threads-0.8.3.tar.gz'';
-      sha256 = "0c3n7qsx4jc3lg8s0n9kxfvhhyl0s7123f3038nsb96rf0bvb5hy";
-    };
-  };
-
-  zpb-ttf = buildLispPackage rec {
-    baseName = "zpb-ttf";
-    version = "release-1.0.3";
-    description = "Access TrueType font metrics and outlines from Common Lisp";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/xach/zpb-ttf'';
-      sha256 = "3092a3ba9f27b091224d11c0ccfb09c9a4632ebfd6c3986df3147f19e53606f2";
-      rev = ''refs/tags/release-1.0.3'';
-    };
-  };
-
-  cl-store = buildLispPackage rec {
-    baseName = "cl-store";
-    version = "git-20141112";
-    description = "Serialization package";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/skypher/cl-store'';
-      sha256 = "7096ad38d5c77d58f7aa0ef8df1884411173c140408cb7967922b315ab505472";
-      rev = ''2d2455c024fe64ee24cbf914c82254fa5bd09cab'';
-    };
-  };
-
-  cl-vectors = buildLispPackage rec {
-    baseName = "cl-vectors";
-    version = "git-20141112";
-    description = "cl-paths: vectorial paths manipulation";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/fjolliton/cl-vectors'';
-      sha256 = "2d1428911cd2699513a0b886661e9b54d1edf78558277ac83723a22c7fc9dea7";
-      rev = ''7b3e5d6a8abe3de307c1dc0c4347f4efa4f25f29'';
-    };
-  };
-
-  trivial-features = buildLispPackage rec {
-    baseName = "trivial-features";
-    version = "git-20141112";
-    description = "Ensures consistent *FEATURES* across multiple CLs";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/trivial-features/trivial-features'';
-      sha256 = "2006aebe0c2bfed1c39a2195639e221fdc52a443b6c8522e535cbef2370a07fc";
-      rev = ''2b7cdc3b8073eb33655850b51223770b535da6d9'';
-    };
-  };
-
-  clsql = buildLispPackage rec {
-    baseName = "clsql";
-    version = "git-20150514";
-    description = "Common Lisp SQL Interface library";
-    deps = [uffi];
-    buildInputs = [pkgs.mysql.client pkgs.zlib];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url =
-        #''http://git.kpe.io/clsql.git''
-	"http://repo.or.cz/r/clsql.git"
-	;
-      sha256 = "073rh2zxwkcd417qfcflv14j273d1j174slsbzidxvy4zgq5r3n6";
-      rev = ''a646f558b54191eda1d64f2926eee7b4fa763f89'';
-    };
-    overrides = x:{
-      preConfigure = ''
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${stdenv.lib.getDev pkgs.mysql.client}/include/mysql"
-        export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.lib.getLib pkgs.mysql.client}/lib/mysql"
-      '';
-    };
-  };
-
-  uffi = buildLispPackage rec {
-    baseName = "uffi";
-    version = "git-20141112";
-    description = "Universal Foreign Function Library for Common Lisp";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''http://git.kpe.io/uffi.git'';
-      sha256 = "1hqszvz0a3wk4s9faa83sc3vjxcb5rxmjclyr17yzwg55z733kry";
-      rev = ''a63da5b764b6fa30e32fcda4ddac88de385c9d5b'';
-    };
-  };
-
-  query-fs = buildLispPackage rec {
-    baseName = "query-fs";
-    version = "git-20150523";
-    description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries";
-    deps = [bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/fb08af68/query-fs'';
-      sha256 = "19h6hscza7p93bc7jvb6ya7ghg96dr1c1v4imlxpjqfdhhdpxsq6";
-      rev = ''0f28e3f31a4cd3636a8edb346230482e68af86c2'';
-    };
-    overrides = x: {
-      linkedSystems = [];
-      postInstall = ''
-        export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs"
-	export HOME=$PWD
-	build-with-lisp.sh sbcl \
-	  ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/ :\2/g')" \
-	  "$out/bin/query-fs" \
-	  "(query-fs:run-fs-with-cmdline-args)"
-      '';
-    };
-  };
-
-  cl-fuse = buildLispPackage rec {
-    baseName = "cl-fuse";
-    version = "git-20141113";
-    description = "CFFI bindings to FUSE (Filesystem in user space)";
-    deps = [bordeaux-threads cffi cl-utilities iterate trivial-backtrace trivial-utf-8];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/fb08af68/cl-fuse'';
-      sha256 = "1l4ydxbwzlj6gkb1c9vc96rfbj951snaidpx10pxz4wdnzg3kq99";
-      rev = ''6feffaa34a21cfc7890b25357284858f924e8cb3'';
-    };
-    propagatedBuildInputs = [pkgs.fuse];
-    overrides = x : {
-      configurePhase = ''
-        export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD"
-        export makeFlags="$makeFlags LISP=common-lisp.sh"
-      '';
-    };
-  };
-
-  cffi = buildLispPackage rec {
-    baseName = "cffi";
-    version = "0.14.0";
-    description = "The Common Foreign Function Interface";
-    deps = [alexandria babel trivial-features];
-    # Source type: http
-    src = pkgs.fetchurl {
-      url = ''http://common-lisp.net/project/cffi/releases/cffi_${version}.tar.gz'';
-      sha256 = "155igjh096vrp7n71c0xcg9qbcpj6547qjvzi9shxbpi6piw6fkw";
-    };
-  };
-
-  babel = buildLispPackage rec {
-    baseName = "babel";
-    version = "git-20141113";
-    description = "A charset conversion library";
-    deps = [alexandria trivial-features];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/cl-babel/babel'';
-      sha256 = "abe7150f25ceb7eded520d95f1665a46f4233cf13b577fd02c3f6be54c32facc";
-      rev = ''74b35ea79b769c4f9aefad933923778ffa7915ab'';
-    };
-  };
-
-  cl-utilities = buildLispPackage rec {
-    baseName = "cl-utilities";
-    version = "1.2.4";
-    description = "A collection of Common Lisp utility functions";
-    deps = [];
-    # Source type: http
-    src = pkgs.fetchurl {
-      url = ''http://common-lisp.net/project/cl-utilities/cl-utilities-${version}.tar.gz'';
-      sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87";
-    };
-  };
-
-  trivial-utf-8 = buildLispPackage rec {
-    baseName = "trivial-utf-8";
-    version = "2011-09-08";
-    description = "A UTF-8 encoding library";
-    deps = [];
-    # Source type: darcs
-    src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs {
-      url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/'';
-      sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1";
-    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";}));
-  };
-
-  cl-fuse-meta-fs = buildLispPackage rec {
-    baseName = "cl-fuse-meta-fs";
-    version = "git-20150523";
-    description = "CFFI bindings to FUSE (Filesystem in user space)";
-    deps = [bordeaux-threads cl-fuse iterate pcall];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/fb08af68/cl-fuse-meta-fs'';
-      sha256 = "0cpxwsc0ma1ypl54n3n37wbgdxhz5j67h28q6rhghjn96dgy4ac9";
-      rev = ''6ab92ebbb8e6f1f69d179214032915e3744d8c03'';
-    };
-  };
-
-  pcall = buildLispPackage rec {
-    baseName = "pcall";
-    version = "0.3";
-    description = "Common Lisp library intended to simplify 'result-oriented' parallelism";
-    deps = [bordeaux-threads];
-    # Source type: http
-    src = pkgs.fetchgit {
-      url = ''https://github.com/marijnh/pcall'';
-      sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps";
-      rev = "4e1ef32c33c2ca18fd8ab9afb4fa793c179a3578";
-    };
-  };
-
-  command-line-arguments = buildLispPackage rec {
-    baseName = "command-line-arguments";
-    version = "git-20151120";
-    description = "Small library to deal with command-line arguments";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''http://common-lisp.net/project/qitab/git/command-line-arguments.git'';
-      sha256 = "0qx33j0bq8dshiyyv8rjwd0zvhqhqx5gby6xrghfy8ylcwf11r5j";
-      rev = ''003bdbc05e2816e43293530f58efb529e9e89a20'';
-    };
-  };
-
-  trivial-backtrace = buildLispPackage rec {
-    baseName = "trivial-backtrace";
-    version = "git-2014-11-01";
-    description = "trivial-backtrace";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''http://common-lisp.net/project/trivial-backtrace/trivial-backtrace.git'';
-      sha256 = "0bclk05lqijpp72yfzrz0wmw142z0mwnpfl4gqv6gl4fpz1qr56s";
-      rev = ''48a6b081e00b0d85f1e001c7258393ed34d06bc9'';
-    };
-  };
-
-  drakma = buildLispPackage rec {
-    baseName = "drakma";
-    version = "v1.3.10";
-    description = "Full-featured http/https client based on usocket";
-    deps = [chipz chunga cl-ssl cl-base64 cl-ppcre flexi-streams puri usocket];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/edicl/drakma'';
-      sha256 = "0ecc37c9d5cc91a3b86746c4f20c0b1609969db01041df04ff6a9df1d021b30a";
-      rev = ''refs/tags/v1.3.10'';
-    };
-  };
-
-  chipz = buildLispPackage rec {
-    baseName = "chipz";
-    version = "git-20141113";
-    description = "A library for decompressing deflate, zlib, and gzip data";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/froydnj/chipz'';
-      sha256 = "0963nyg8173q0svqhk0ggbvfr4i57jk3swkf0r87jh3yi2l983sl";
-      rev = ''3402c94df1d0af7742df08d3ffa23fd5c04c9bf2'';
-    };
-  };
-
-  chunga = buildLispPackage rec {
-    baseName = "chunga";
-    version = "v1.1.5";
-    description = "Portable chunked streams";
-    deps = [trivial-gray-streams];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/edicl/chunga'';
-      sha256 = "5d045882be34b158185c491da85cfd4671f456435c9ff8fa311a864f633b0446";
-      rev = ''refs/tags/v1.1.5'';
-    };
-  };
-
-  trivial-gray-streams = buildLispPackage rec {
-    baseName = "trivial-gray-streams";
-    version = "git-20141113";
-    description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/trivial-gray-streams/trivial-gray-streams'';
-      sha256 = "8d5c041f95eb31aa313adc433edf91bb14656400cae1e0ec98ad7ed085bb7954";
-      rev = ''0483ade330508b4b2edeabdb47d16ec9437ee1cb'';
-    };
-  };
-
-  cl-ssl = buildLispPackage rec {
-    baseName = "cl+ssl";
-    version = "git-20141113";
-    description = "Common Lisp interface to OpenSSL";
-    deps = [bordeaux-threads cffi flexi-streams trivial-garbage trivial-gray-streams];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/cl-plus-ssl/cl-plus-ssl'';
-      sha256 = "6b99fc49ac38e49ee69a47ce5791606b8b811c01e5563bfd3164d393db6c4040";
-      rev = ''f8695c5df48ebc3557f76a8a08dd96429bdf8df2'';
-    };
-    propagatedBuildInputs = [pkgs.openssl];
-  };
-
-  flexi-streams = buildLispPackage rec {
-    baseName = "flexi-streams";
-    version = "v1.0.13";
-    description = "Flexible bivalent streams for Common Lisp";
-    deps = [trivial-gray-streams];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/edicl/flexi-streams'';
-      sha256 = "46d6b056cffc9ea201dedde847b071db744dfbadf0a21a261717272fe3d85cab";
-      rev = ''refs/tags/v1.0.13'';
-    };
-  };
-
-  trivial-garbage = buildLispPackage rec {
-    baseName = "trivial-garbage";
-    version = "git-20141113";
-    description = "Portable finalizers, weak hash-tables and weak pointers";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/trivial-garbage/trivial-garbage'';
-      sha256 = "0r029lfl5srmhanmmh7bb692pdwb32cnbq2navx6cm3iqda9q87i";
-      rev = ''2721d36d71748d9736a82fe5afe333c52bae3084'';
-    };
-  };
-
-  cl-base64 = buildLispPackage rec {
-    baseName = "cl-base64";
-    version = "git-20141113";
-    description = "Base64 encoding and decoding with URI support";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''http://git.kpe.io/cl-base64.git'';
-      sha256 = "0cq3dxac3l0z2xp3c3gkgj893hvaz4vvxdz0nsc8c9q28q3nwf4p";
-      rev = ''f375d1fc3a6616e95ae88bb33493bb99f920ba13'';
-    };
-  };
-
-  puri = buildLispPackage rec {
-    baseName = "puri";
-    version = "git-20141113";
-    description = "Portable Universal Resource Indentifier Library";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''http://git.kpe.io/puri.git'';
-      sha256 = "1l7d8i9615kyi7n69l07a6ri0d1k13cya0kbg3fmfqanwn5kzv2i";
-      rev = ''68260dbf320c01089c8cee54ef32c800eefcde7f'';
-    };
-  };
-
-  usocket = buildLispPackage rec {
-    baseName = "usocket";
-    version = "0.6.1";
-    description = "Universal socket library for Common Lisp";
-    deps = [];
-    # Source type: http
-    src = pkgs.fetchurl {
-      url = ''http://common-lisp.net/project/usocket/releases/usocket-${version}.tar.gz'';
-      sha256 = "1lnhjli85w20iy5nn6j6gsyxx42mvj8l0dfhwcjpl6dl2lz80r7a";
-    };
-  };
-
-  cl-html-parse = buildLispPackage rec {
-    baseName = "cl-html-parse";
-    version = "git-20141113";
-    description = "HTML Parser";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/gwkkwg/cl-html-parse'';
-      sha256 = "0s8jjn3s55m59nihc8qiw2s71gn09sxsaii343rzfwdrkdwk9vzh";
-      rev = ''b21e8757210a1eb2a47104a563f58bf82ba9a579'';
-    };
-  };
-
-  nibbles = buildLispPackage rec {
-    baseName = "nibbles";
-    version = "git-20141116";
-    description = "A library for accessing octet-addressed blocks of data";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/froydnj/nibbles'';
-      sha256 = "0p0swss7xjx74sr95wqak5hfhfw13bwkzncy4l4hbfy130gncv8b";
-      rev = ''ace095d85e48b18bf9cf9e21249ba7fb57e3efe2'';
-    };
-  };
-
-  ironclad = buildLispPackage rec {
-    baseName = "ironclad";
-    version = "0.33.0";
-    description = "A cryptographic toolkit written in pure Common Lisp";
-    deps = [nibbles];
-    # Source type: http
-    src = pkgs.fetchurl {
-      url = ''http://method-combination.net/lisp/files/ironclad_0.33.0.tar.gz'';
-      sha256 = "1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7";
-    };
-  };
-
-  cl-smtp = buildLispPackage rec {
-    baseName = "cl-smtp";
-    version = "git-2015-07-01";
-    description = "SMTP client library";
-    deps = [cl-ssl cl-base64 flexi-streams trivial-gray-streams usocket];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = "https://gitlab.common-lisp.net/cl-smtp/cl-smtp.git";
-      sha256 = "0kvb34jzb3hgvzqlwwwmnyaqj0ghlgmi1x2zll5qw5089gbhfv10";
-      rev = ''2bf946c1d561c0085dba6d6337e3e53d9711a5d2'';
-    };
-  };
-
-  md5 = buildLispPackage rec {
-    baseName = "md5";
-    version = "git-20150415";
-    description = "The MD5 Message-Digest Algorithm RFC 1321";
-    deps = [];
-    # Source type: git
-    src = pkgs.fetchgit {
-      url = ''https://github.com/pmai/md5'';
-      sha256 = "18k6k04cqx9zx0q8x3hk5icvjhihra1za7k2jx82xb19jfnjli1y";
-      rev = ''9d6f82f7121c87fb7e3b314987ba93900d300dc6'';
-    };
-  };
-
   clx-xkeyboard = buildLispPackage rec {
     baseName = "clx-xkeyboard";
     version = "git-20150523";
     description = "CLX support for X Keyboard extensions";
-    deps = [clx];
+    deps = with pkgs.quicklispPackages; [clx];
     # Source type: git
     src = pkgs.fetchgit {
       url = ''https://github.com/filonenko-mikhail/clx-xkeyboard'';
@@ -601,6 +57,5 @@ let lispPackages = rec {
       '';
     };
   };
-
 };
 in lispPackages
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
new file mode 100644
index 000000000000..0606f8878213
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-aa'';
+  version = ''cl-vectors-20150407-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'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-aa)"' "$out/bin/cl-aa-lisp-launcher.sh" ""
+    '';
+  };
+}
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
new file mode 100644
index 000000000000..e0722a8a7bba
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-fuse-meta-fs'';
+  version = ''20150608-git'';
+
+  description = ''CFFI bindings to FUSE (Filesystem in user space)'';
+
+  deps = [ args."bordeaux-threads" args."cl-fuse" args."iterate" args."pcall" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz'';
+    sha256 = ''1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-fuse-meta-fs)"' "$out/bin/cl-fuse-meta-fs-lisp-launcher.sh" ""
+    '';
+  };
+}
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
new file mode 100644
index 000000000000..e26f205c4f45
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-paths-ttf'';
+  version = ''cl-vectors-20150407-git'';
+
+  description = ''cl-paths-ttf: vectorial paths manipulation'';
+
+  deps = [ args."cl-paths" args."zpb-ttf" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
+    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-paths-ttf)"' "$out/bin/cl-paths-ttf-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
new file mode 100644
index 000000000000..836b523f556d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-paths'';
+  version = ''cl-vectors-20150407-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'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-paths)"' "$out/bin/cl-paths-lisp-launcher.sh" ""
+    '';
+  };
+}
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
new file mode 100644
index 000000000000..fff81d9411f9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-smtp'';
+  version = ''20160825-git'';
+
+  description = ''Common Lisp smtp client.'';
+
+  deps = [ args."cl+ssl" args."cl-base64" args."flexi-streams" args."trivial-gray-streams" args."usocket" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz'';
+    sha256 = ''0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-smtp)"' "$out/bin/cl-smtp-lisp-launcher.sh" ""
+    '';
+  };
+}
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
new file mode 100644
index 000000000000..79a841314f7a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-store'';
+  version = ''20160531-git'';
+
+  description = ''Serialization package'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz'';
+    sha256 = ''0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-store)"' "$out/bin/cl-store-lisp-launcher.sh" ""
+    '';
+  };
+}
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
new file mode 100644
index 000000000000..88ca12f7bfb7
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -0,0 +1,23 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-unification'';
+  version = ''20170124-git'';
+
+  description = ''The CL-UNIFICATION system.
+
+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'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-unification)"' "$out/bin/cl-unification-lisp-launcher.sh" ""
+    '';
+  };
+}
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
new file mode 100644
index 000000000000..5b399bfc9ee6
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-vectors'';
+  version = ''20150407-git'';
+
+  description = ''cl-paths: vectorial paths manipulation'';
+
+  deps = [ args."cl-aa" args."cl-paths" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
+    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :cl-vectors)"' "$out/bin/cl-vectors-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
new file mode 100644
index 000000000000..4bb11260f2ba
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''clsql'';
+  version = ''20160208-git'';
+
+  description = ''Common Lisp SQL Interface library'';
+
+  deps = [ args."uffi" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz'';
+    sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clsql)"' "$out/bin/clsql-lisp-launcher.sh" ""
+    '';
+  };
+}
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
new file mode 100644
index 000000000000..1c672aaa4be6
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''clx-truetype'';
+  version = ''20160825-git'';
+
+  description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.'';
+
+  deps = [ args."cl-aa" args."cl-fad" args."cl-paths-ttf" args."cl-store" args."cl-vectors" args."clx" args."trivial-features" args."zpb-ttf" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz'';
+    sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :clx-truetype)"' "$out/bin/clx-truetype-lisp-launcher.sh" ""
+    '';
+  };
+}
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
new file mode 100644
index 000000000000..5cbef72e3dc9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''command-line-arguments'';
+  version = ''20151218-git'';
+
+  description = ''small library to deal with command-line arguments'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz'';
+    sha256 = ''07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :command-line-arguments)"' "$out/bin/command-line-arguments-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
new file mode 100644
index 000000000000..6e19879b29d1
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''pcall-queue'';
+  version = ''pcall-0.3'';
+
+  description = '''';
+
+  deps = [ args."bordeaux-threads" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
+    sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :pcall-queue)"' "$out/bin/pcall-queue-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
new file mode 100644
index 000000000000..06068e36dfb3
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''pcall'';
+  version = ''0.3'';
+
+  description = '''';
+
+  deps = [ args."bordeaux-threads" args."pcall-queue" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
+    sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :pcall)"' "$out/bin/pcall-lisp-launcher.sh" ""
+    '';
+  };
+}
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
new file mode 100644
index 000000000000..8962c687d864
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''query-fs'';
+  version = ''20160531-git'';
+
+  description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries'';
+
+  deps = [ args."bordeaux-threads" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."command-line-arguments" args."iterate" args."trivial-backtrace" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz'';
+    sha256 = ''0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :query-fs)"' "$out/bin/query-fs-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
new file mode 100644
index 000000000000..ee860285e7b4
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''uffi'';
+  version = ''20150923-git'';
+
+  description = ''Universal Foreign Function Library for Common Lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz'';
+    sha256 = ''1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :uffi)"' "$out/bin/uffi-lisp-launcher.sh" ""
+    '';
+  };
+}
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
new file mode 100644
index 000000000000..896b9bba8a60
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -0,0 +1,21 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''zpb-ttf'';
+  version = ''1.0.3'';
+
+  description = ''Access TrueType font metrics and outlines from Common Lisp'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz'';
+    sha256 = ''1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6'';
+  };
+
+  overrides = x: {
+    postInstall = ''
+        echo "$CL_SOURCE_REGISTRY"
+        NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :zpb-ttf)"' "$out/bin/zpb-ttf-lisp-launcher.sh" ""
+    '';
+  };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index c073b40b14c1..f4ccf19d2d9f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -62,4 +62,27 @@ in
     trivial-gray-streams babel
   ]);
   css-lite = addDeps (with qlnp; [parenscript]);
+  clsql = x: {
+    propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib];
+    overrides = y: (x.overrides y) // {
+      preConfigure = ((x.overrides y).preConfigure or "") + ''
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.lib.getDev pkgs.mysql.client}/include/mysql"
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.lib.getLib pkgs.mysql.client}/lib/mysql"
+      '';
+    };
+  };
+  clx-truetype = skipBuildPhase;
+  query-fs = x: {
+    overrides = y: (x.overrides y) // {
+      linkedSystems = [];
+      postInstall = ''
+        export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs"
+	export HOME=$PWD
+	build-with-lisp.sh sbcl \
+	  ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/ :\2/g')" \
+	  "$out/bin/query-fs" \
+	  "(query-fs:run-fs-with-cmdline-args)"
+      '';
+    };
+  };
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index a32dd823a7e1..581ccf77d995 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -11,16 +11,22 @@ cl-async
 cl-base64
 cl-cookie
 cl-fuse
+cl-fuse-meta-fs
 cl-json
 cl-l10n
 closer-mop
 cl-ppcre
 cl-reexport
+cl-smtp
 cl-syntax-annot
 cl-unicode
+cl-unification
 cl-utilities
 cl-who
+clsql
 clx
+clx-truetype
+command-line-arguments
 parenscript
 css-lite
 cxml
@@ -43,9 +49,11 @@ lquery
 marshal
 optima
 parenscript
+pcall
 plump
 proc-parse
 prove
+query-fs
 quri
 salza2
 smart-buffer
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 2b9afcf286e0..672dda1b096b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -43,14 +43,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "trivial-garbage" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."trivial-garbage" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-garbage.nix {
-         inherit fetchurl;
-       }));
-
-
   "cxml-xml" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cxml-xml" or (x: {}))
@@ -62,6 +54,22 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-paths" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-paths" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-paths.nix {
+         inherit fetchurl;
+       }));
+
+
+  "trivial-garbage" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-garbage" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-garbage.nix {
+         inherit fetchurl;
+       }));
+
+
   "cffi-toolchain" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cffi-toolchain" or (x: {}))
@@ -138,6 +146,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "pcall-queue" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."pcall-queue" or (x: {}))
+       (import ./quicklisp-to-nix-output/pcall-queue.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+       }));
+
+
   "form-fiddle" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."form-fiddle" or (x: {}))
@@ -248,20 +265,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cl+ssl" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl+ssl" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl+ssl.nix {
-         inherit fetchurl;
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-
-
   "chunga" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."chunga" or (x: {}))
@@ -308,6 +311,58 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "zpb-ttf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."zpb-ttf" or (x: {}))
+       (import ./quicklisp-to-nix-output/zpb-ttf.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-vectors" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-vectors" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-vectors.nix {
+         inherit fetchurl;
+           "cl-aa" = quicklisp-to-nix-packages."cl-aa";
+           "cl-paths" = quicklisp-to-nix-packages."cl-paths";
+       }));
+
+
+  "cl-store" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-store" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-store.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-paths-ttf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-paths-ttf" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-paths-ttf.nix {
+         inherit fetchurl;
+           "cl-paths" = quicklisp-to-nix-packages."cl-paths";
+           "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
+       }));
+
+
+  "cl-aa" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-aa" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-aa.nix {
+         inherit fetchurl;
+       }));
+
+
+  "uffi" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."uffi" or (x: {}))
+       (import ./quicklisp-to-nix-output/uffi.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl-annot" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-annot" or (x: {}))
@@ -317,6 +372,20 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl+ssl" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl+ssl" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl+ssl.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
   "metabang-bind" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."metabang-bind" or (x: {}))
@@ -633,6 +702,21 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "query-fs" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."query-fs" or (x: {}))
+       (import ./quicklisp-to-nix-output/query-fs.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-fuse" = quicklisp-to-nix-packages."cl-fuse";
+           "cl-fuse-meta-fs" = quicklisp-to-nix-packages."cl-fuse-meta-fs";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "command-line-arguments" = quicklisp-to-nix-packages."command-line-arguments";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+       }));
+
+
   "prove" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."prove" or (x: {}))
@@ -667,6 +751,16 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "pcall" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."pcall" or (x: {}))
+       (import ./quicklisp-to-nix-output/pcall.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "pcall-queue" = quicklisp-to-nix-packages."pcall-queue";
+       }));
+
+
   "optima" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."optima" or (x: {}))
@@ -894,6 +988,30 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "command-line-arguments" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."command-line-arguments" or (x: {}))
+       (import ./quicklisp-to-nix-output/command-line-arguments.nix {
+         inherit fetchurl;
+       }));
+
+
+  "clx-truetype" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clx-truetype" or (x: {}))
+       (import ./quicklisp-to-nix-output/clx-truetype.nix {
+         inherit fetchurl;
+           "cl-aa" = quicklisp-to-nix-packages."cl-aa";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-paths-ttf" = quicklisp-to-nix-packages."cl-paths-ttf";
+           "cl-store" = quicklisp-to-nix-packages."cl-store";
+           "cl-vectors" = quicklisp-to-nix-packages."cl-vectors";
+           "clx" = quicklisp-to-nix-packages."clx";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
+       }));
+
+
   "clx" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clx" or (x: {}))
@@ -902,6 +1020,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "clsql" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql.nix {
+         inherit fetchurl;
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
   "cl-who" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-who" or (x: {}))
@@ -918,6 +1045,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-unification" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-unification" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-unification.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl-unicode" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-unicode" or (x: {}))
@@ -936,6 +1071,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-smtp" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-smtp" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-smtp.nix {
+         inherit fetchurl;
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+       }));
+
+
   "cl-reexport" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-reexport" or (x: {}))
@@ -987,6 +1135,18 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-fuse-meta-fs" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-fuse-meta-fs" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-fuse-meta-fs.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-fuse" = quicklisp-to-nix-packages."cl-fuse";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "pcall" = quicklisp-to-nix-packages."pcall";
+       }));
+
+
   "cl-fuse" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-fuse" or (x: {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42de4fd80e1d..6e6471ca83ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10390,9 +10390,8 @@ with pkgs;
     inherit clwrapper;
   };
 
-  lispPackagesClisp = lispPackagesFor (wrapLisp clisp);
-  lispPackagesSBCL = lispPackagesFor (wrapLisp sbcl);
-  lispPackages = recurseIntoAttrs lispPackagesSBCL;
+  lispPackages = recurseIntoAttrs (quicklispPackages_asdf_3_1 //
+    lispPackagesFor (wrapLisp sbcl));
 
   quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules/quicklisp-to-nix.nix {
     inherit clwrapper;