From 807445a10b4d6f2faff3765bbe1dc38cad81b31c Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Fri, 17 Jan 2020 18:05:34 +0000
Subject: refactor(third_party/lisp): Amend alexandria drv for local sources

---
 third_party/lisp/alexandria.nix         | 32 --------------------------------
 third_party/lisp/alexandria/default.nix | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 32 deletions(-)
 delete mode 100644 third_party/lisp/alexandria.nix
 create mode 100644 third_party/lisp/alexandria/default.nix

(limited to 'third_party/lisp')

diff --git a/third_party/lisp/alexandria.nix b/third_party/lisp/alexandria.nix
deleted file mode 100644
index dbe0554d6286..000000000000
--- a/third_party/lisp/alexandria.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-# Alexandria is one of the foundational Common Lisp libraries that
-# pretty much everything depends on:
-#
-# https://common-lisp.net/project/alexandria/
-{ pkgs, ... }:
-
-let src = builtins.fetchGit {
-  url = "https://gitlab.common-lisp.net/alexandria/alexandria";
-  rev = "1224346a48770dc07a68ef3e612b9ac3d611eb07";
-};
-in pkgs.nix.buildLisp.library {
-  name = "alexandria";
-  srcs = map (f: src + ("/" + f)) [
-    "package.lisp"
-    "definitions.lisp"
-    "binding.lisp"
-    "strings.lisp"
-    "conditions.lisp"
-    "symbols.lisp"
-    "macros.lisp"
-    "functions.lisp"
-    "io.lisp"
-    "hash-tables.lisp"
-    "control-flow.lisp"
-    "lists.lisp"
-    "types.lisp"
-    "arrays.lisp"
-    "sequences.lisp"
-    "numbers.lisp"
-    "features.lisp"
-  ];
-}
diff --git a/third_party/lisp/alexandria/default.nix b/third_party/lisp/alexandria/default.nix
new file mode 100644
index 000000000000..3c3fb8370821
--- /dev/null
+++ b/third_party/lisp/alexandria/default.nix
@@ -0,0 +1,28 @@
+# Alexandria is one of the foundational Common Lisp libraries that
+# pretty much everything depends on:
+#
+# Imported from https://common-lisp.net/project/alexandria/
+{ pkgs, ... }:
+
+pkgs.nix.buildLisp.library {
+  name = "alexandria";
+  srcs = [
+    ./package.lisp
+    ./definitions.lisp
+    ./binding.lisp
+    ./strings.lisp
+    ./conditions.lisp
+    ./symbols.lisp
+    ./macros.lisp
+    ./functions.lisp
+    ./io.lisp
+    ./hash-tables.lisp
+    ./control-flow.lisp
+    ./lists.lisp
+    ./types.lisp
+    ./arrays.lisp
+    ./sequences.lisp
+    ./numbers.lisp
+    ./features.lisp
+  ];
+}
-- 
cgit 1.4.1