about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-01-17T18·05+0000
committerVincent Ambo <tazjin@google.com>2020-01-17T18·05+0000
commit807445a10b4d6f2faff3765bbe1dc38cad81b31c (patch)
treead97066e1ce22a4748ed0dd7dc783d5e1a76ef21
parent0a9a56953435382fa00357efb489860cee600a58 (diff)
refactor(third_party/lisp): Amend alexandria drv for local sources r/395
-rw-r--r--third_party/lisp/alexandria.nix32
-rw-r--r--third_party/lisp/alexandria/default.nix28
2 files changed, 28 insertions, 32 deletions
diff --git a/third_party/lisp/alexandria.nix b/third_party/lisp/alexandria.nix
deleted file mode 100644
index dbe0554d62..0000000000
--- 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 0000000000..3c3fb83708
--- /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
+  ];
+}