From 4bbbb58cb537014dd8b0b3c3c560c039ac57ad89 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Fri, 21 Feb 2020 12:47:29 +0000
Subject: chore: Rename pkgs->depot in all Nix file headers

---
 third_party/lisp/alexandria/default.nix        |  4 ++--
 third_party/lisp/asdf-flv/default.nix          |  4 ++--
 third_party/lisp/babel.nix                     |  6 +++---
 third_party/lisp/bordeaux-threads.nix          |  6 +++---
 third_party/lisp/cffi.nix                      |  6 +++---
 third_party/lisp/chipz.nix                     |  6 +++---
 third_party/lisp/chunga.nix                    |  8 ++++----
 third_party/lisp/cl-ansi-text.nix              |  6 +++---
 third_party/lisp/cl-base64.nix                 |  4 ++--
 third_party/lisp/cl-colors2.nix                |  6 +++---
 third_party/lisp/cl-fad.nix                    |  8 ++++----
 third_party/lisp/cl-json.nix                   |  6 +++---
 third_party/lisp/cl-plus-ssl.nix               |  8 ++++----
 third_party/lisp/cl-ppcre.nix                  |  4 ++--
 third_party/lisp/cl-prevalence.nix             |  8 ++++----
 third_party/lisp/closer-mop.nix                |  6 +++---
 third_party/lisp/drakma.nix                    |  8 ++++----
 third_party/lisp/fiveam/default.nix            |  6 +++---
 third_party/lisp/flexi-streams.nix             |  6 +++---
 third_party/lisp/hunchentoot.nix               | 10 +++++-----
 third_party/lisp/iterate.nix                   |  4 ++--
 third_party/lisp/lisp-binary.nix               |  8 ++++----
 third_party/lisp/local-time.nix                |  8 ++++----
 third_party/lisp/md5.nix                       |  6 +++---
 third_party/lisp/moptilities.nix               |  8 ++++----
 third_party/lisp/puri.nix                      |  4 ++--
 third_party/lisp/quasiquote_2/default.nix      |  6 +++---
 third_party/lisp/rfc2388.nix                   |  6 +++---
 third_party/lisp/s-sysdeps.nix                 |  6 +++---
 third_party/lisp/s-xml/default.nix             |  4 ++--
 third_party/lisp/split-sequence.nix            |  4 ++--
 third_party/lisp/trivial-backtrace/default.nix |  5 ++---
 third_party/lisp/trivial-features.nix          |  4 ++--
 third_party/lisp/trivial-garbage.nix           |  4 ++--
 third_party/lisp/trivial-gray-streams.nix      |  4 ++--
 third_party/lisp/unix-opts.nix                 |  6 +++---
 third_party/lisp/usocket.nix                   |  8 ++++----
 37 files changed, 110 insertions(+), 111 deletions(-)

(limited to 'third_party/lisp')

diff --git a/third_party/lisp/alexandria/default.nix b/third_party/lisp/alexandria/default.nix
index 3c3fb83708..2358c898b3 100644
--- a/third_party/lisp/alexandria/default.nix
+++ b/third_party/lisp/alexandria/default.nix
@@ -2,9 +2,9 @@
 # pretty much everything depends on:
 #
 # Imported from https://common-lisp.net/project/alexandria/
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.nix.buildLisp.library {
+depot.nix.buildLisp.library {
   name = "alexandria";
   srcs = [
     ./package.lisp
diff --git a/third_party/lisp/asdf-flv/default.nix b/third_party/lisp/asdf-flv/default.nix
index 9a170700f8..e8ec4aa8f8 100644
--- a/third_party/lisp/asdf-flv/default.nix
+++ b/third_party/lisp/asdf-flv/default.nix
@@ -1,7 +1,7 @@
 # Imported from https://github.com/didierverna/asdf-flv
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.nix;
+with depot.nix;
 buildLisp.library {
   name = "asdf-flv";
   deps = [ (buildLisp.bundled "asdf") ];
diff --git a/third_party/lisp/babel.nix b/third_party/lisp/babel.nix
index ba367df9ad..7c066904fe 100644
--- a/third_party/lisp/babel.nix
+++ b/third_party/lisp/babel.nix
@@ -1,13 +1,13 @@
 # Babel is an encoding conversion library for Common Lisp.
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "https://github.com/cl-babel/babel.git";
   rev = "ec9a17cdbdba3c1dd39609fc7961cfb3f0aa260e";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "babel";
-  deps = [ pkgs.third_party.lisp.alexandria ];
+  deps = [ depot.third_party.lisp.alexandria ];
 
   srcs = map (f: src + ("/src/" + f)) [
     "packages.lisp"
diff --git a/third_party/lisp/bordeaux-threads.nix b/third_party/lisp/bordeaux-threads.nix
index 7ced6bf134..b2596672ba 100644
--- a/third_party/lisp/bordeaux-threads.nix
+++ b/third_party/lisp/bordeaux-threads.nix
@@ -1,14 +1,14 @@
 # This library is meant to make writing portable multi-threaded apps
 # in Common Lisp simple.
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "https://github.com/sionescu/bordeaux-threads.git";
   rev = "499b6d3f0ce635417d6096acf0a671d8bf3f6e5f";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "bordeaux-threads";
-  deps = [ pkgs.third_party.lisp.alexandria ];
+  deps = [ depot.third_party.lisp.alexandria ];
 
   srcs = map (f: src + ("/src/" + f)) [
     "pkgdcl.lisp"
diff --git a/third_party/lisp/cffi.nix b/third_party/lisp/cffi.nix
index a01dab8924..62c1f81da7 100644
--- a/third_party/lisp/cffi.nix
+++ b/third_party/lisp/cffi.nix
@@ -1,14 +1,14 @@
 # CFFI purports to be the Common Foreign Function Interface.
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.nix;
+with depot.nix;
 let src = builtins.fetchGit {
   url = "https://github.com/cffi/cffi.git";
   rev = "5e838bf46d0089c43ebd3ea014a207c403e29c61";
 };
 in buildLisp.library {
   name = "cffi";
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     alexandria
     babel
     trivial-features
diff --git a/third_party/lisp/chipz.nix b/third_party/lisp/chipz.nix
index 8f29792bc1..dfbf32b094 100644
--- a/third_party/lisp/chipz.nix
+++ b/third_party/lisp/chipz.nix
@@ -1,9 +1,9 @@
 # Common Lisp library for decompressing deflate, zlib, gzip, and bzip2 data
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.nix;
+with depot.nix;
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "froydnj";
   repo = "chipz";
   rev = "75dfbc660a5a28161c57f115adf74c8a926bfc4d";
diff --git a/third_party/lisp/chunga.nix b/third_party/lisp/chunga.nix
index b56fb3b90c..f787981887 100644
--- a/third_party/lisp/chunga.nix
+++ b/third_party/lisp/chunga.nix
@@ -1,15 +1,15 @@
 # Portable chunked streams for Common Lisp
-{ pkgs, ... }:
+{ depot, ... }:
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "edicl";
   repo = "chunga";
   rev = "16330852d01dfde4dd97dee7cd985a88ea571e7e";
   sha256 = "0jzn3nyb3f22gm983rfk99smqs3mhb9ivjmasvhq9qla5cl9pyhd";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "chunga";
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     trivial-gray-streams
   ];
 
diff --git a/third_party/lisp/cl-ansi-text.nix b/third_party/lisp/cl-ansi-text.nix
index 88fcae318b..5c01e02326 100644
--- a/third_party/lisp/cl-ansi-text.nix
+++ b/third_party/lisp/cl-ansi-text.nix
@@ -1,13 +1,13 @@
 # Enables ANSI colors for printing.
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "https://github.com/pnathan/cl-ansi-text.git";
   rev = "257a5f19a2dc92d22f8fd772c0a78923b99b36a8";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "cl-ansi-text";
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     alexandria
     cl-colors2
   ];
diff --git a/third_party/lisp/cl-base64.nix b/third_party/lisp/cl-base64.nix
index c4dc9ca2c7..1152601a81 100644
--- a/third_party/lisp/cl-base64.nix
+++ b/third_party/lisp/cl-base64.nix
@@ -1,11 +1,11 @@
 # Base64 encoding for Common Lisp
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "http://git.kpe.io/cl-base64.git";
   rev = "fc62a5342445d4ec1dd44e95f7dc513473a8c89a";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "cl-base64";
   srcs = [
     (src + "/package.lisp")
diff --git a/third_party/lisp/cl-colors2.nix b/third_party/lisp/cl-colors2.nix
index 44417d7d94..c90b8eae01 100644
--- a/third_party/lisp/cl-colors2.nix
+++ b/third_party/lisp/cl-colors2.nix
@@ -1,13 +1,13 @@
 
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "https://notabug.org/cage/cl-colors2.git";
   rev = "795aedee593b095fecde574bd999b520dd03ed24";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "cl-colors2";
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     alexandria
     cl-ppcre
   ];
diff --git a/third_party/lisp/cl-fad.nix b/third_party/lisp/cl-fad.nix
index 194ecd3956..8131bf31be 100644
--- a/third_party/lisp/cl-fad.nix
+++ b/third_party/lisp/cl-fad.nix
@@ -1,9 +1,9 @@
 # Portable pathname library
-{ pkgs, ...}:
+{ depot, ...}:
 
-with pkgs.nix;
+with depot.nix;
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "edicl";
   repo = "cl-fad";
   rev = "c13d81c4bd9ba3a172631fd05dd213ab90e7d4cb";
@@ -12,7 +12,7 @@ let src = pkgs.third_party.fetchFromGitHub {
 in buildLisp.library {
   name = "cl-fad";
 
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     alexandria
     bordeaux-threads
     (buildLisp.bundled "sb-posix")
diff --git a/third_party/lisp/cl-json.nix b/third_party/lisp/cl-json.nix
index b0362ff313..3652bd0793 100644
--- a/third_party/lisp/cl-json.nix
+++ b/third_party/lisp/cl-json.nix
@@ -1,8 +1,8 @@
 # JSON encoder & decoder
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.nix;
-let src = pkgs.third_party.fetchFromGitHub {
+with depot.nix;
+let src = depot.third_party.fetchFromGitHub {
   owner = "hankhero";
   repo = "cl-json";
   rev = "6dfebb9540bfc3cc33582d0c03c9ec27cb913e79";
diff --git a/third_party/lisp/cl-plus-ssl.nix b/third_party/lisp/cl-plus-ssl.nix
index 1e725ba00a..63c21aa6ba 100644
--- a/third_party/lisp/cl-plus-ssl.nix
+++ b/third_party/lisp/cl-plus-ssl.nix
@@ -1,7 +1,7 @@
 # Common Lisp bindings to OpenSSL
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.nix;
+with depot.nix;
 
 let src = builtins.fetchGit {
   url = "https://github.com/cl-plus-ssl/cl-plus-ssl.git";
@@ -9,7 +9,7 @@ let src = builtins.fetchGit {
 };
 in buildLisp.library {
   name = "cl-plus-ssl";
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     alexandria
     bordeaux-threads
     cffi
@@ -21,7 +21,7 @@ in buildLisp.library {
     (buildLisp.bundled "sb-posix")
   ];
 
-  native = [ pkgs.third_party.openssl ];
+  native = [ depot.third_party.openssl ];
 
   srcs = map (f: src + ("/src/" + f)) [
     "package.lisp"
diff --git a/third_party/lisp/cl-ppcre.nix b/third_party/lisp/cl-ppcre.nix
index 78480fe34f..1dc9eb5531 100644
--- a/third_party/lisp/cl-ppcre.nix
+++ b/third_party/lisp/cl-ppcre.nix
@@ -1,11 +1,11 @@
 # cl-ppcre is a Common Lisp regular expression library.
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "https://github.com/edicl/cl-ppcre";
   rev = "1ca0cd9ca0d161acd49c463d6cb5fff897596e2f";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "cl-ppcre";
 
   srcs = map (f: src + ("/" + f)) [
diff --git a/third_party/lisp/cl-prevalence.nix b/third_party/lisp/cl-prevalence.nix
index 1502f2e231..c024db0924 100644
--- a/third_party/lisp/cl-prevalence.nix
+++ b/third_party/lisp/cl-prevalence.nix
@@ -1,17 +1,17 @@
 # cl-prevalence is an implementation of object prevalence for CL (i.e.
 # an in-memory database)
-{ pkgs, ... }:
+{ depot, ... }:
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "40ants";
   repo = "cl-prevalence";
   rev = "da3ed6c4594b1c2fca90c178c1993973c4bf16c9";
   sha256 = "0bq905hv1626dl6b7s0zn4lbdh608g1pxaljl1fda6pwp9hmj95a";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "cl-prevalence";
 
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     s-xml
     s-sysdeps
   ];
diff --git a/third_party/lisp/closer-mop.nix b/third_party/lisp/closer-mop.nix
index a63f520f22..ab7e33e59b 100644
--- a/third_party/lisp/closer-mop.nix
+++ b/third_party/lisp/closer-mop.nix
@@ -1,15 +1,15 @@
 # Closer to MOP is a compatibility layer that rectifies many of the
 # absent or incorrect CLOS MOP features across a broad range of Common
 # Lisp implementations
-{ pkgs, ... }:
+{ depot, ... }:
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "pcostanza";
   repo = "closer-mop";
   rev = "e1d1430524086709a7ea8e0eede6849aa29d6276";
   sha256 = "1zda6927379pmrsxpg29jnj6azjpa2pms9h7n1iwhy6q9d3w06rf";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "closer-mop";
 
   srcs = [
diff --git a/third_party/lisp/drakma.nix b/third_party/lisp/drakma.nix
index aac85909d1..8b8b9f1c90 100644
--- a/third_party/lisp/drakma.nix
+++ b/third_party/lisp/drakma.nix
@@ -1,9 +1,9 @@
 # Drakma is an HTTP client for Common Lisp.
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.nix;
+with depot.nix;
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "edicl";
   repo = "drakma";
   rev = "87feb02bef00b11a753d5fb21a5fec526b0d0bbb";
@@ -11,7 +11,7 @@ let src = pkgs.third_party.fetchFromGitHub {
 };
 in buildLisp.library {
   name = "drakma";
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     chipz
     chunga
     cl-base64
diff --git a/third_party/lisp/fiveam/default.nix b/third_party/lisp/fiveam/default.nix
index 07b4cc0ee5..4236b93bc9 100644
--- a/third_party/lisp/fiveam/default.nix
+++ b/third_party/lisp/fiveam/default.nix
@@ -2,12 +2,12 @@
 #
 # Imported from https://github.com/sionescu/fiveam.git
 
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.nix.buildLisp.library {
+depot.nix.buildLisp.library {
   name = "fiveam";
 
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     alexandria
     asdf-flv
     trivial-backtrace
diff --git a/third_party/lisp/flexi-streams.nix b/third_party/lisp/flexi-streams.nix
index 56a7f7b92e..8cdf062f1c 100644
--- a/third_party/lisp/flexi-streams.nix
+++ b/third_party/lisp/flexi-streams.nix
@@ -1,13 +1,13 @@
 # Flexible bivalent streams for Common Lisp
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "https://github.com/edicl/flexi-streams.git";
   rev = "0fd872ae32022e834ef861a67d86879cf33a6b64";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "flexi-streams";
-  deps = [ pkgs.third_party.lisp.trivial-gray-streams ];
+  deps = [ depot.third_party.lisp.trivial-gray-streams ];
 
   srcs = map (f: src + ("/" + f)) [
     "packages.lisp"
diff --git a/third_party/lisp/hunchentoot.nix b/third_party/lisp/hunchentoot.nix
index 726eb222e5..9977405c65 100644
--- a/third_party/lisp/hunchentoot.nix
+++ b/third_party/lisp/hunchentoot.nix
@@ -1,14 +1,14 @@
 # Hunchentoot is a web framework for Common Lisp.
-{ pkgs, ...}:
+{ depot, ...}:
 
 let
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "edicl";
     repo = "hunchentoot";
     rev = "585b45b6b873f2da421fdf456b61860ab5868207";
     sha256 = "13nazwix067mdclq9vgjhsi2vpr57a8dz51dd5d3h99ccsq4mik5";
   };
-  url-rewrite = pkgs.nix.buildLisp.library {
+  url-rewrite = depot.nix.buildLisp.library {
     name = "url-rewrite";
 
     srcs = map (f: src + ("/url-rewrite/" + f)) [
@@ -19,10 +19,10 @@ let
       "url-rewrite.lisp"
     ];
   };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "hunchentoot";
 
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     alexandria
     bordeaux-threads
     chunga
diff --git a/third_party/lisp/iterate.nix b/third_party/lisp/iterate.nix
index b9309c36b4..2e6873885f 100644
--- a/third_party/lisp/iterate.nix
+++ b/third_party/lisp/iterate.nix
@@ -1,12 +1,12 @@
 # iterate is an iteration construct for Common Lisp, similar to the
 # LOOP macro.
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "https://gitlab.common-lisp.net/iterate/iterate.git";
   rev = "a1c47b2b74f6c96149d717be90c07a1b273ced69";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "iterate";
   srcs = [
     "${src}/package.lisp"
diff --git a/third_party/lisp/lisp-binary.nix b/third_party/lisp/lisp-binary.nix
index 6f340bfab9..f2dab565c2 100644
--- a/third_party/lisp/lisp-binary.nix
+++ b/third_party/lisp/lisp-binary.nix
@@ -1,16 +1,16 @@
 # A library to easily read and write complex binary formats.
-{ pkgs, ... }:
+{ depot, ... }:
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "j3pic";
   repo = "lisp-binary";
   rev = "1aefc8618b7734f68697ddf59bc93cb8522aa0bf";
   sha256 = "1hflzn3mjp32jz9fxx9wayp3c3x58s77cgjfbs06nrynqkv0c6df";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "lisp-binary";
 
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     cffi
     quasiquote_2
     moptilities
diff --git a/third_party/lisp/local-time.nix b/third_party/lisp/local-time.nix
index 6f501a5fe9..52e7c257e4 100644
--- a/third_party/lisp/local-time.nix
+++ b/third_party/lisp/local-time.nix
@@ -1,15 +1,15 @@
 # Library for manipulating dates & times
-{ pkgs, ... }:
+{ depot, ... }:
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "dlowe-net";
   repo = "local-time";
   rev = "dc54f61415c76ee755a6f69d4154a3a282f2789f";
   sha256 = "1l9v07ghx7g9p2gp003fki4j8bsa1w2gbm40qc41i94mdzikc0ry";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "local-time";
-  deps = [ pkgs.third_party.lisp.cl-fad ];
+  deps = [ depot.third_party.lisp.cl-fad ];
 
   srcs = [
     "${src}/src/package.lisp"
diff --git a/third_party/lisp/md5.nix b/third_party/lisp/md5.nix
index 229b61709d..3f2ed371de 100644
--- a/third_party/lisp/md5.nix
+++ b/third_party/lisp/md5.nix
@@ -1,9 +1,9 @@
 # MD5 hash implementation
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.nix;
+with depot.nix;
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "pmai";
   repo = "md5";
   rev = "b1412600f60d526ee34a7ba1596ec483da7894ab";
diff --git a/third_party/lisp/moptilities.nix b/third_party/lisp/moptilities.nix
index df72de5ce3..24a7f2c06d 100644
--- a/third_party/lisp/moptilities.nix
+++ b/third_party/lisp/moptilities.nix
@@ -1,14 +1,14 @@
 # Compatibility layer for minor MOP implementation differences
-{ pkgs, ... }:
+{ depot, ... }:
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "gwkkwg";
   repo = "moptilities";
   rev = "a436f16b357c96b82397ec018ea469574c10dd41";
   sha256 = "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "moptilities";
-  deps = [ pkgs.third_party.lisp.closer-mop ];
+  deps = [ depot.third_party.lisp.closer-mop ];
   srcs = [ "${src}/dev/moptilities.lisp" ];
 }
diff --git a/third_party/lisp/puri.nix b/third_party/lisp/puri.nix
index 1ac22a3996..51728c7646 100644
--- a/third_party/lisp/puri.nix
+++ b/third_party/lisp/puri.nix
@@ -1,11 +1,11 @@
 # Portable URI library
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "http://git.kpe.io/puri.git";
   rev = "ef5afb9e5286c8e952d4344f019c1a636a717b97";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "puri";
   srcs = [
     (src + "/src.lisp")
diff --git a/third_party/lisp/quasiquote_2/default.nix b/third_party/lisp/quasiquote_2/default.nix
index 3febfca2b6..521c384787 100644
--- a/third_party/lisp/quasiquote_2/default.nix
+++ b/third_party/lisp/quasiquote_2/default.nix
@@ -1,11 +1,11 @@
 # Quasiquote more suitable for macros that define other macros
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.nix.buildLisp.library {
+depot.nix.buildLisp.library {
   name = "quasiquote-2.0";
 
   deps = [
-    pkgs.third_party.lisp.iterate
+    depot.third_party.lisp.iterate
   ];
 
   srcs = [
diff --git a/third_party/lisp/rfc2388.nix b/third_party/lisp/rfc2388.nix
index 863bb3f9ac..8288094904 100644
--- a/third_party/lisp/rfc2388.nix
+++ b/third_party/lisp/rfc2388.nix
@@ -1,13 +1,13 @@
 # Implementation of RFC2388 (multipart/form-data)
-{ pkgs, ... }:
+{ depot, ... }:
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "jdz";
   repo = "rfc2388";
   rev = "591bcf7e77f2c222c43953a80f8c297751dc0c4e";
   sha256 = "0phh5n3clhl9ji8jaxrajidn22d3f0aq87mlbfkkxlnx2pnw694k";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "rfc2388";
 
   srcs = map (f: src + ("/" + f)) [
diff --git a/third_party/lisp/s-sysdeps.nix b/third_party/lisp/s-sysdeps.nix
index 3b90f3a7ea..aebd7c3f7b 100644
--- a/third_party/lisp/s-sysdeps.nix
+++ b/third_party/lisp/s-sysdeps.nix
@@ -1,13 +1,13 @@
 # A Common Lisp abstraction layer over platform dependent functionality.
-{ pkgs, ... }:
+{ depot, ... }:
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "svenvc";
   repo = "s-sysdeps";
   rev = "d28246b5dffef9e73a0e0e6cfbc4e878006fe34d";
   sha256 = "14b69b81yrxmjlvmm3lfxk04x5v7hqz4fql121334wh72czznfh9";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "s-sysdeps";
 
   srcs = [
diff --git a/third_party/lisp/s-xml/default.nix b/third_party/lisp/s-xml/default.nix
index 884846a30f..82b6317f37 100644
--- a/third_party/lisp/s-xml/default.nix
+++ b/third_party/lisp/s-xml/default.nix
@@ -1,9 +1,9 @@
 # XML serialiser for Common Lisp.
 #
 # This system was imported from a Quicklisp tarball at 's-xml-20150608'.
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.nix.buildLisp.library {
+depot.nix.buildLisp.library {
   name = "s-xml";
 
   srcs = [
diff --git a/third_party/lisp/split-sequence.nix b/third_party/lisp/split-sequence.nix
index bccd0d6fcc..105646386f 100644
--- a/third_party/lisp/split-sequence.nix
+++ b/third_party/lisp/split-sequence.nix
@@ -1,11 +1,11 @@
 # split-sequence is a library for, well, splitting sequences apparently.
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "https://github.com/sharplispers/split-sequence.git";
   rev = "41c0fc79a5a2871d16e5727969a8f699ef44d791";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "split-sequence";
   srcs = map (f: src + ("/" + f)) [
     "package.lisp"
diff --git a/third_party/lisp/trivial-backtrace/default.nix b/third_party/lisp/trivial-backtrace/default.nix
index b21aba9357..bdd057cade 100644
--- a/third_party/lisp/trivial-backtrace/default.nix
+++ b/third_party/lisp/trivial-backtrace/default.nix
@@ -1,9 +1,8 @@
 # Imported from http://common-lisp.net/project/trivial-backtrace/trivial-backtrace.git
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.nix.buildLisp.library {
+depot.nix.buildLisp.library {
   name = "trivial-backtrace";
-  # deps = with pkgs.third_party.lisp; [ asdf ];
 
   srcs = [
     ./dev/packages.lisp
diff --git a/third_party/lisp/trivial-features.nix b/third_party/lisp/trivial-features.nix
index c0ff0d2e20..b7808a2364 100644
--- a/third_party/lisp/trivial-features.nix
+++ b/third_party/lisp/trivial-features.nix
@@ -1,10 +1,10 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "https://github.com/trivial-features/trivial-features.git";
   rev = "b78b2df5d75bdf8fdfc69f0deec0a187d9664b0b";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "trivial-features";
   srcs = [
     (src + "/src/tf-sbcl.lisp")
diff --git a/third_party/lisp/trivial-garbage.nix b/third_party/lisp/trivial-garbage.nix
index 8b2b6f0d31..e5b3550de7 100644
--- a/third_party/lisp/trivial-garbage.nix
+++ b/third_party/lisp/trivial-garbage.nix
@@ -1,12 +1,12 @@
 # trivial-garbage provides a portable API to finalizers, weak
 # hash-tables and weak pointers
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "https://github.com/trivial-garbage/trivial-garbage.git";
   rev = "dbc8e35acb0176b9a14fdc1027f5ebea93435a84";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "trivial-garbage";
   srcs = [ (src + "/trivial-garbage.lisp") ];
 }
diff --git a/third_party/lisp/trivial-gray-streams.nix b/third_party/lisp/trivial-gray-streams.nix
index 3d91f81209..b5722f9a68 100644
--- a/third_party/lisp/trivial-gray-streams.nix
+++ b/third_party/lisp/trivial-gray-streams.nix
@@ -1,11 +1,11 @@
 # Portability library for CL gray streams.
-{ pkgs, ... }:
+{ depot, ... }:
 
 let src = builtins.fetchGit {
   url = "https://github.com/trivial-gray-streams/trivial-gray-streams.git";
   rev = "ebd59b1afed03b9dc8544320f8f432fdf92ab010";
 };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "trivial-gray-streams";
   srcs = [
     (src + "/package.lisp")
diff --git a/third_party/lisp/unix-opts.nix b/third_party/lisp/unix-opts.nix
index 138da1c7fa..99117d8beb 100644
--- a/third_party/lisp/unix-opts.nix
+++ b/third_party/lisp/unix-opts.nix
@@ -1,14 +1,14 @@
 # unix-opts is a portable command line argument parser
-{ pkgs, ...}:
+{ depot, ...}:
 
 let
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "libre-man";
     repo = "unix-opts";
     rev = "b805050b074bd860edd18cfc8776fdec666ec36e";
     sha256 = "0j93dkc9f77wz1zfspm7q1scx6wwbm6jhk8vl2rm6bfd0n8scxla";
   };
-in pkgs.nix.buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "unix-opts";
 
   srcs = [
diff --git a/third_party/lisp/usocket.nix b/third_party/lisp/usocket.nix
index 0f40ab64aa..920c41c58d 100644
--- a/third_party/lisp/usocket.nix
+++ b/third_party/lisp/usocket.nix
@@ -1,9 +1,9 @@
 # Usocket is a portable socket library
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.nix;
+with depot.nix;
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = depot.third_party.fetchFromGitHub {
   owner = "usocket";
   repo = "usocket";
   rev = "fdf4fd1e0051ce83340ccfbbc8a43a462bb19cf2";
@@ -11,7 +11,7 @@ let src = pkgs.third_party.fetchFromGitHub {
 };
 in buildLisp.library {
   name = "usocket";
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     (buildLisp.bundled "asdf")
     (buildLisp.bundled "sb-bsd-sockets")
     split-sequence
-- 
cgit 1.4.1