From e76843d337546fe83dbbc9eba9cff52ca6767ef7 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Thu, 23 Jan 2020 16:31:54 +0000
Subject: [PATCH] Create third_party

Create a third_party subdirectory and a third_party/lisp. This directory layout
resembles and is inspired by the layout of Google's mono-repo, Google3. @tazjin
borrowed this idea from Google and I'm borrowing the idea from him.
---
 common-lisp/prove-asdf.nix                    | 15 --------------
 .../lisp}/anaphora.nix                        |  4 ++--
 .../lisp}/cl-colors.nix                       | 14 ++++++++-----
 .../lisp}/let-plus.nix                        | 14 ++++++++-----
 {common-lisp => third_party/lisp}/prove.nix   | 20 +++++++++++--------
 5 files changed, 32 insertions(+), 35 deletions(-)
 delete mode 100644 common-lisp/prove-asdf.nix
 rename {common-lisp => third_party/lisp}/anaphora.nix (74%)
 rename {common-lisp => third_party/lisp}/cl-colors.nix (60%)
 rename {common-lisp => third_party/lisp}/let-plus.nix (57%)
 rename {common-lisp => third_party/lisp}/prove.nix (64%)

diff --git a/common-lisp/prove-asdf.nix b/common-lisp/prove-asdf.nix
deleted file mode 100644
index 8a692cf12..000000000
--- 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
similarity index 74%
rename from common-lisp/anaphora.nix
rename to third_party/lisp/anaphora.nix
index f64d01a50..04a1dd847 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
similarity index 60%
rename from common-lisp/cl-colors.nix
rename to third_party/lisp/cl-colors.nix
index cff40fef3..2217e68ce 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
similarity index 57%
rename from common-lisp/let-plus.nix
rename to third_party/lisp/let-plus.nix
index 5b279477d..a3a15776b 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
similarity index 64%
rename from common-lisp/prove.nix
rename to third_party/lisp/prove.nix
index a4499dcea..d6c0fe741 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"