lispPackages: migrate to quicklispPackages where possible

1 files changed, 182 insertions, 22 deletions

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 2b9afcf286e..672dda1b096 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: {}))