5 files changed, 32 insertions, 35 deletions
diff --git a/common-lisp/prove-asdf.nix b/common-lisp/prove-asdf.nix
deleted file mode 100644
index 8a692cf125ad..000000000000
--- a/common-lisp/prove-asdf.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ tpkgs ? (import (builtins.fetchGit "https://git.tazj.in/") {}), ... }:
-
-let
-  src = builtins.fetchGit {
-    url = "https://github.com/fukamachi/prove.git";
-    rev = "5d71f02795b89e36f34e8c7d50e69b67ec6ca2de";
-  };
-in tpkgs.nix.buildLisp.library {
-  name = "prove-asdf";
-  deps = [];
-  srcs = [
-    "${src}/src/output.lisp"
-    "${src}/src/asdf.lisp"
-  ];
-}
diff --git a/common-lisp/anaphora.nix b/third_party/lisp/anaphora.nix
index f64d01a50eee..04a1dd847feb 100644
--- a/common-lisp/anaphora.nix
+++ b/third_party/lisp/anaphora.nix
@@ -1,11 +1,11 @@
-{ tpkgs ? (import (builtins.fetchGit "https://git.tazj.in/") {}), ... }:
+{ depot ? import <depot> {}, ... }:
 
 let
   src = builtins.fetchGit {
     url = "https://github.com/tokenrove/anaphora.git";
     rev = "aeace4c68cf55098a67112750b28f8f2dc6d0e30";
   };
-in tpkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "anaphora";
   deps = [];
   srcs = [
diff --git a/common-lisp/cl-colors.nix b/third_party/lisp/cl-colors.nix
index cff40fef342d..2217e68ce70b 100644
--- a/common-lisp/cl-colors.nix
+++ b/third_party/lisp/cl-colors.nix
@@ -1,15 +1,19 @@
-{ tpkgs ? (import (builtins.fetchGit "https://git.tazj.in/") {}), ... }:
+{
+  depot ? import <depot> {},
+  universe ? import <universe> {},
+  ...
+}:
 
 let
   src = builtins.fetchGit {
     url = "https://github.com/tpapp/cl-colors.git";
     rev = "827410584553f5c717eec6182343b7605f707f75";
   };
-in tpkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "cl-colors";
-  deps = with tpkgs.third_party.lisp; [
-    alexandria
-    (import ./let-plus.nix {})
+  deps = [
+    depot.third_party.lisp.alexandria
+    universe.third_party.lisp.let-plus
   ];
   srcs = [
     "${src}/package.lisp"
diff --git a/common-lisp/let-plus.nix b/third_party/lisp/let-plus.nix
index 5b279477de1b..a3a15776bf86 100644
--- a/common-lisp/let-plus.nix
+++ b/third_party/lisp/let-plus.nix
@@ -1,15 +1,19 @@
-{ tpkgs ? (import (builtins.fetchGit "https://git.tazj.in/") {}), ... }:
+{
+  depot ? import <depot> {},
+  universe ? import <universe> {},
+  ...
+}:
 
 let
   src = builtins.fetchGit {
     url = "https://github.com/tpapp/let-plus.git";
     rev = "7cf18b29ed0fe9c667a9a6a101b08ab9661a59e9";
   };
-in tpkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "let-plus";
-  deps = with tpkgs.third_party.lisp; [
-    alexandria
-    (import ./anaphora.nix {})
+  deps = [
+    depot.third_party.lisp.alexandria
+    universe.third_party.lisp.anaphora
   ];
   srcs = [
     "${src}/package.lisp"
diff --git a/common-lisp/prove.nix b/third_party/lisp/prove.nix
index a4499dcea9bb..d6c0fe7413cb 100644
--- a/common-lisp/prove.nix
+++ b/third_party/lisp/prove.nix
@@ -1,18 +1,22 @@
-{ tpkgs ? (import (builtins.fetchGit "https://git.tazj.in/") {}), ... }:
+{
+  depot ? import <depot> {},
+  universe? import <universe> {},
+  ...
+}:
 
 let
   src = builtins.fetchGit {
     url = "https://github.com/fukamachi/prove.git";
     rev = "5d71f02795b89e36f34e8c7d50e69b67ec6ca2de";
   };
-in tpkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "prove";
-  deps = with tpkgs.third_party.lisp; [
-    cl-ppcre
-    cl-ansi-text
-    (import ./cl-colors.nix {})
-    alexandria
-    uiop
+  deps = [
+    depot.third_party.lisp.cl-ppcre
+    depot.third_party.lisp.cl-ansi-text
+    depot.third_party.lisp.alexandria
+    depot.third_party.lisp.uiop
+    universe.third_party.lisp.cl-colors
   ];
   srcs = [
     "${src}/src/asdf.lisp"