From 5c9079a41059e077f2b71b68eb83ff9fcb2e38d1 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Wed, 29 Jan 2020 14:43:20 +0000
Subject: Splice ./universe directory into ./

Manually merging:
- README.md: I added the description from universe/README.md into the heading of
  dotfiles/README.md.
- .envrc: dotfiles/.envrc was a superset of universe/.envrc
- .gitignore: Adding some of the ignored patterns from universe/.gitignore to
  dotfiles/.gitignore

Everything else here should be a simple rename.
---
 third_party/lisp/anaphora.nix           | 17 ++++++++++++++++
 third_party/lisp/cl-arrows.nix          | 15 ++++++++++++++
 third_party/lisp/cl-colors.nix          | 24 ++++++++++++++++++++++
 third_party/lisp/let-plus.nix           | 23 ++++++++++++++++++++++
 third_party/lisp/linear-programming.nix | 26 ++++++++++++++++++++++++
 third_party/lisp/prove.nix              | 35 +++++++++++++++++++++++++++++++++
 6 files changed, 140 insertions(+)
 create mode 100644 third_party/lisp/anaphora.nix
 create mode 100644 third_party/lisp/cl-arrows.nix
 create mode 100644 third_party/lisp/cl-colors.nix
 create mode 100644 third_party/lisp/let-plus.nix
 create mode 100644 third_party/lisp/linear-programming.nix
 create mode 100644 third_party/lisp/prove.nix

(limited to 'third_party/lisp')

diff --git a/third_party/lisp/anaphora.nix b/third_party/lisp/anaphora.nix
new file mode 100644
index 000000000000..04a1dd847feb
--- /dev/null
+++ b/third_party/lisp/anaphora.nix
@@ -0,0 +1,17 @@
+{ depot ? import <depot> {}, ... }:
+
+let
+  src = builtins.fetchGit {
+    url = "https://github.com/tokenrove/anaphora.git";
+    rev = "aeace4c68cf55098a67112750b28f8f2dc6d0e30";
+  };
+in depot.nix.buildLisp.library {
+  name = "anaphora";
+  deps = [];
+  srcs = [
+    "${src}/packages.lisp"
+    "${src}/early.lisp"
+    "${src}/symbolic.lisp"
+    "${src}/anaphora.lisp"
+  ];
+}
diff --git a/third_party/lisp/cl-arrows.nix b/third_party/lisp/cl-arrows.nix
new file mode 100644
index 000000000000..60cd8a375b1c
--- /dev/null
+++ b/third_party/lisp/cl-arrows.nix
@@ -0,0 +1,15 @@
+{ depot ? import <depot> {}, ... }:
+
+let
+  src = builtins.fetchGit {
+    url = "https://github.com/nightfly19/cl-arrows.git";
+    rev = "cbb46b69a7de40f1161c9caaf6cef93b3af9994f";
+  };
+in depot.nix.buildLisp.library {
+  name = "cl-arrows";
+  deps = [];
+  srcs = [
+    "${src}/packages.lisp"
+    "${src}/arrows.lisp"
+  ];
+}
diff --git a/third_party/lisp/cl-colors.nix b/third_party/lisp/cl-colors.nix
new file mode 100644
index 000000000000..2217e68ce70b
--- /dev/null
+++ b/third_party/lisp/cl-colors.nix
@@ -0,0 +1,24 @@
+{
+  depot ? import <depot> {},
+  universe ? import <universe> {},
+  ...
+}:
+
+let
+  src = builtins.fetchGit {
+    url = "https://github.com/tpapp/cl-colors.git";
+    rev = "827410584553f5c717eec6182343b7605f707f75";
+  };
+in depot.nix.buildLisp.library {
+  name = "cl-colors";
+  deps = [
+    depot.third_party.lisp.alexandria
+    universe.third_party.lisp.let-plus
+  ];
+  srcs = [
+    "${src}/package.lisp"
+    "${src}/colors.lisp"
+    "${src}/colornames.lisp"
+    "${src}/hexcolors.lisp"
+  ];
+}
diff --git a/third_party/lisp/let-plus.nix b/third_party/lisp/let-plus.nix
new file mode 100644
index 000000000000..a3a15776bf86
--- /dev/null
+++ b/third_party/lisp/let-plus.nix
@@ -0,0 +1,23 @@
+{
+  depot ? import <depot> {},
+  universe ? import <universe> {},
+  ...
+}:
+
+let
+  src = builtins.fetchGit {
+    url = "https://github.com/tpapp/let-plus.git";
+    rev = "7cf18b29ed0fe9c667a9a6a101b08ab9661a59e9";
+  };
+in depot.nix.buildLisp.library {
+  name = "let-plus";
+  deps = [
+    depot.third_party.lisp.alexandria
+    universe.third_party.lisp.anaphora
+  ];
+  srcs = [
+    "${src}/package.lisp"
+    "${src}/let-plus.lisp"
+    "${src}/extensions.lisp"
+  ];
+}
diff --git a/third_party/lisp/linear-programming.nix b/third_party/lisp/linear-programming.nix
new file mode 100644
index 000000000000..432fedb8bcac
--- /dev/null
+++ b/third_party/lisp/linear-programming.nix
@@ -0,0 +1,26 @@
+{ depot ? import <depot> {}, ... }:
+
+let
+  src = builtins.fetchGit {
+    url = "https://github.com/neil-lindquist/linear-programming.git";
+    rev = "8c8d55e7584773b90c4ba4b225c5f2008f4c474a";
+  };
+in depot.nix.buildLisp.library {
+  name = "linear-programming";
+  deps = [
+    (depot.nix.buildLisp.bundled "uiop")
+    depot.third_party.lisp.iterate
+    depot.third_party.lisp.alexandria
+  ];
+  srcs = [
+    "${src}/src/conditions.lisp"
+    "${src}/src/expressions.lisp"
+    "${src}/src/simplex.lisp"
+    "${src}/src/system-info.lisp"
+    "${src}/src/utils.lisp"
+    "${src}/src/problem.lisp"
+    "${src}/src/solver.lisp"
+    "${src}/src/external-formats.lisp"
+    "${src}/src/all.lisp"
+  ];
+}
diff --git a/third_party/lisp/prove.nix b/third_party/lisp/prove.nix
new file mode 100644
index 000000000000..d6c0fe7413cb
--- /dev/null
+++ b/third_party/lisp/prove.nix
@@ -0,0 +1,35 @@
+{
+  depot ? import <depot> {},
+  universe? import <universe> {},
+  ...
+}:
+
+let
+  src = builtins.fetchGit {
+    url = "https://github.com/fukamachi/prove.git";
+    rev = "5d71f02795b89e36f34e8c7d50e69b67ec6ca2de";
+  };
+in depot.nix.buildLisp.library {
+  name = "prove";
+  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"
+    "${src}/src/suite.lisp"
+    "${src}/src/color.lisp"
+    "${src}/src/output.lisp"
+    "${src}/src/prove.lisp"
+    "${src}/src/report.lisp"
+    "${src}/src/reporter.lisp"
+    "${src}/src/test.lisp"
+    "${src}/src/reporter/dot.lisp"
+    "${src}/src/reporter/fiveam.lisp"
+    "${src}/src/reporter/list.lisp"
+    "${src}/src/reporter/tap.lisp"
+  ];
+}
-- 
cgit 1.4.1