chore: Rename pkgs->depot in all Nix file headers r/559

113 files changed, 318 insertions, 349 deletions

diff --git a/fun/amsterdump/default.nix b/fun/amsterdump/default.nix
index e5fc22a176..0d98c9a7ab 100644
--- a/fun/amsterdump/default.nix
+++ b/fun/amsterdump/default.nix
@@ -1,12 +1,12 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.program {
+depot.nix.buildGo.program {
   name = "amsterdump";
   srcs = [
     ./main.go
   ];
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     # gopkgs."golang.org".x.oauth2.google
     gopkgs."googlemaps.github.io".maps
   ];
diff --git a/fun/aoc2019/default.nix b/fun/aoc2019/default.nix
index a53586eea9..5f1f248c50 100644
--- a/fun/aoc2019/default.nix
+++ b/fun/aoc2019/default.nix
@@ -1,7 +1,7 @@
 # Solutions for Advent of Code 2019, written in Emacs Lisp.
 #
 # For each day a new file is created as "solution-day$n.el".
-{ pkgs, ... }:
+{ depot, ... }:
 
 let
   inherit (builtins) attrNames filter head listToAttrs match readDir;
@@ -13,7 +13,7 @@ let
   solutionFiles = filter (e: dir."${e}" == "regular" && isSolution e) (attrNames dir);
   solutions = map (f: let day = getDay f; in {
     name = day;
-    value = pkgs.writeElispBin {
+    value = depot.writeElispBin { # TODO(tazjin): move writeElispBin to depot.nix
       name = "aoc2019";
       deps = p: with p; [ dash s ht ];
       src = ./. + ("/" + f);
diff --git a/fun/gemma/default.nix b/fun/gemma/default.nix
index cecf8bb751..55612106d2 100644
--- a/fun/gemma/default.nix
+++ b/fun/gemma/default.nix
@@ -1,8 +1,8 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
 let
-  inherit (pkgs) elmPackages;
-  inherit (pkgs.third_party) cacert iana-etc libredirect stdenv runCommandNoCC;
+  inherit (depot) elmPackages;
+  inherit (depot.third_party) cacert iana-etc libredirect stdenv runCommandNoCC writeText;
 
   frontend = stdenv.mkDerivation {
     name = "gemma-frontend.html";
@@ -26,17 +26,17 @@ let
     '';
   };
 
-  injectFrontend = pkgs.writeText "gemma-frontend.lisp" ''
+  injectFrontend = writeText "gemma-frontend.lisp" ''
     (in-package :gemma)
     (setq *static-file-location* "${runCommandNoCC "frontend" {} ''
       mkdir -p $out
       cp ${frontend} $out/index.html
     ''}/")
   '';
-in pkgs.nix.buildLisp.program {
+in depot.nix.buildLisp.program {
   name = "gemma";
 
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     cl-json
     cl-prevalence
     hunchentoot
diff --git a/fun/quinistry/default.nix b/fun/quinistry/default.nix
index 8b005da8f6..b12c5e6f0c 100644
--- a/fun/quinistry/default.nix
+++ b/fun/quinistry/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.program {
+depot.nix.buildGo.program {
   name = "quinistry";
   srcs = [
     ./const.go
diff --git a/fun/watchblob/default.nix b/fun/watchblob/default.nix
index 51f14ab163..dc32e4d1ce 100644
--- a/fun/watchblob/default.nix
+++ b/fun/watchblob/default.nix
@@ -1,13 +1,13 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.program {
+depot.nix.buildGo.program {
   name = "watchblob";
   srcs = [
     ./main.go
     ./urls.go
   ];
 
-  deps = with pkgs.third_party; [
+  deps = with depot.third_party; [
     gopkgs."golang.org".x.crypto.ssh.terminal.gopkg
   ];
 }
diff --git a/fun/wcl/default.nix b/fun/wcl/default.nix
index ca1cbb8058..e4d9804c80 100644
--- a/fun/wcl/default.nix
+++ b/fun/wcl/default.nix
@@ -1,13 +1,13 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.nix.buildLisp.program {
+depot.nix.buildLisp.program {
   name = "wc";
 
   srcs = [
     ./wc.lisp
   ];
 
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     unix-opts
     iterate
   ];
diff --git a/lisp/dns/default.nix b/lisp/dns/default.nix
index 198a4622a3..43e7ea5030 100644
--- a/lisp/dns/default.nix
+++ b/lisp/dns/default.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.nix.buildLisp.library {
+depot.nix.buildLisp.library {
   name = "dns";
 
-  deps = with pkgs.third_party.lisp; [
+  deps = with depot.third_party.lisp; [
     drakma
     lisp-binary
     iterate
diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix
index 3203206fbe..0e94ed6223 100644
--- a/nix/buildLisp/default.nix
+++ b/nix/buildLisp/default.nix
@@ -4,12 +4,11 @@
 # buildLisp is designed to enforce conventions and do away with the
 # free-for-all of existing Lisp build systems.
 
-{ pkgs ? { third_party = import <nixpkgs> {}; }
-, ... }:
+{ pkgs ? import <nixpkgs> {}, ... }:
 
 let
   inherit (builtins) map elemAt match filter;
-  inherit (pkgs.third_party) lib runCommandNoCC makeWrapper writeText writeShellScriptBin sbcl;
+  inherit (pkgs) lib runCommandNoCC makeWrapper writeText writeShellScriptBin sbcl;
 
   #
   # Internal helper definitions
diff --git a/nix/buildLisp/example/default.nix b/nix/buildLisp/example/default.nix
index 4a8cba6002..6a518e4964 100644
--- a/nix/buildLisp/example/default.nix
+++ b/nix/buildLisp/example/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
 let
-  inherit (pkgs.nix) buildLisp;
+  inherit (depot.nix) buildLisp;
 
   # Example Lisp library.
   #
diff --git a/nix/tailscale/default.nix b/nix/tailscale/default.nix
index d836850aa1..a21af7d115 100644
--- a/nix/tailscale/default.nix
+++ b/nix/tailscale/default.nix
@@ -2,9 +2,9 @@
 #
 # https://tailscale.com/kb/1018/install-acls
 
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.nix.yants;
+with depot.nix.yants;
 
 let
   inherit (builtins) toFile toJSON;
diff --git a/nix/yants/tests/default.nix b/nix/yants/tests/default.nix
index ae144db45a..b006f8b832 100644
--- a/nix/yants/tests/default.nix
+++ b/nix/yants/tests/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ depot, pkgs, ... }:
 
 with builtins;
-with pkgs.nix.yants;
+with depot.nix.yants;
 
 # Note: Derivations are not included in the tests below as they cause
 # issues with deepSeq.
diff --git a/ops/journaldriver/default.nix b/ops/journaldriver/default.nix
index 2df5e58fc8..cc274094a9 100644
--- a/ops/journaldriver/default.nix
+++ b/ops/journaldriver/default.nix
@@ -1,9 +1,11 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.third_party.naersk.buildPackage {
+with depot.third_party;
+
+naersk.buildPackage {
   src = ./.;
 
-  buildInputs = with pkgs.third_party; [
-    pkgconfig openssl systemd.dev    
+  buildInputs = [
+    pkgconfig openssl systemd.dev
   ];
 }
diff --git a/ops/kms_pass.nix b/ops/kms_pass.nix
index b8a97d1332..2399559b4d 100644
--- a/ops/kms_pass.nix
+++ b/ops/kms_pass.nix
@@ -6,9 +6,9 @@
 #
 # Only the 'show' and 'insert' commands are supported.
 
-{ pkgs, kms, ... }:
+{ depot, kms, ... }:
 
-let inherit (pkgs.third_party) google-cloud-sdk tree writeShellScriptBin;
+let inherit (depot.third_party) google-cloud-sdk tree writeShellScriptBin;
 in (writeShellScriptBin "pass" ''
   set -eo pipefail
 
diff --git a/ops/kontemplate/default.nix b/ops/kontemplate/default.nix
index 8a56bba7fe..9085f31c30 100644
--- a/ops/kontemplate/default.nix
+++ b/ops/kontemplate/default.nix
@@ -10,9 +10,9 @@
 # This file is the Nix derivation used to install Kontemplate on
 # Nix-based systems.
 
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.third_party; buildGoPackage rec {
+with depot.third_party; buildGoPackage rec {
   name = "kontemplate-${version}";
   version = "master";
   src = ./.;
diff --git a/ops/mq_cli/default.nix b/ops/mq_cli/default.nix
index 190a05c805..6b0e32009a 100644
--- a/ops/mq_cli/default.nix
+++ b/ops/mq_cli/default.nix
@@ -1,3 +1,3 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.third_party.naersk.buildPackage ./.
+depot.third_party.naersk.buildPackage ./.
diff --git a/ops/nixos/camden/default.nix b/ops/nixos/camden/default.nix
index 7c9c2a4c59..e60385e8fe 100644
--- a/ops/nixos/camden/default.nix
+++ b/ops/nixos/camden/default.nix
@@ -1,12 +1,11 @@
 # This file configures camden.tazj.in, my homeserver.
-
-{ pkgs, lib, ... }:
+{ depot, lib, ... }:
 
 config: let
-  nixpkgs = import pkgs.third_party.nixpkgsSrc {
+  nixpkgs = import depot.third_party.nixpkgsSrc {
     config.allowUnfree = true;
   };
-in pkgs.lib.fix(self: {
+in lib.fix(self: {
   imports = [ ../modules/tailscale.nix ];
 
   # camden is intended to boot unattended, despite having an encrypted
@@ -64,7 +63,7 @@ in pkgs.lib.fix(self: {
 
     nixPath = [
       "depot=/home/tazjin/depot"
-      "nixpkgs=${pkgs.third_party.nixpkgsSrc}"
+      "nixpkgs=${depot.third_party.nixpkgsSrc}"
     ];
 
     trustedUsers = [ "root" "tazjin" ];
@@ -87,7 +86,7 @@ in pkgs.lib.fix(self: {
 
   environment.systemPackages =
     # programs from the depot
-    (with pkgs; [
+    (with depot; [
       third_party.git
       third_party.tailscale
       third_party.pounce
@@ -129,8 +128,8 @@ in pkgs.lib.fix(self: {
   services.tailscale = {
     enable = true;
     relayConf = "/etc/tailscale.conf";
-    package = pkgs.third_party.tailscale;
-    aclFile = pkgs.nix.tailscale {
+    package = depot.third_party.tailscale;
+    aclFile = depot.nix.tailscale {
       ACLs = [
         # Allow any traffic from myself
         {
@@ -145,7 +144,7 @@ in pkgs.lib.fix(self: {
   # Run cgit for the depot. The onion here is nginx(thttpd(cgit)).
   systemd.services.cgit = {
     wantedBy = [ "multi-user.target" ];
-    script = "${pkgs.web.cgit-taz}/bin/cgit-launch";
+    script = "${depot.web.cgit-taz}/bin/cgit-launch";
 
     serviceConfig = {
       Restart = "on-failure";
@@ -202,18 +201,18 @@ in pkgs.lib.fix(self: {
       serverAliases = [ "camden.tazj.in" ];
       default = true;
       useACMEHost = "tazj.in";
-      root = pkgs.web.homepage;
+      root = depot.web.homepage;
       addSSL = true;
 
       extraConfig = ''
-        ${pkgs.web.blog.oldRedirects}
+        ${depot.web.blog.oldRedirects}
 
         location ~* \.(webp|woff2)$ {
           add_header Cache-Control "public, max-age=31536000";
         }
 
         location /blog/ {
-          alias ${pkgs.web.blog.rendered}/;
+          alias ${depot.web.blog.rendered}/;
 
           if ($request_uri ~ ^/(.*)\.html$) {
             return 302 /$1;
diff --git a/ops/nixos/default.nix b/ops/nixos/default.nix
index 0182d9bd09..040bfeb6e2 100644
--- a/ops/nixos/default.nix
+++ b/ops/nixos/default.nix
@@ -1,17 +1,15 @@
-# TODO(tazjin): rename 'pkgs' -> 'depot'?
-{ pkgs, ... }:
+{ depot, lib, ... }:
 
 let
-  inherit (pkgs) lib;
   inherit (builtins) foldl';
 
-  systemFor = configs: (pkgs.third_party.nixos {
+  systemFor = configs: (depot.third_party.nixos {
     configuration = lib.fix(config:
       foldl' lib.recursiveUpdate {} (map (c: c config) configs)
     );
   }).system;
 
-  rebuilder = pkgs.third_party.writeShellScriptBin "rebuilder" ''
+  rebuilder = depot.third_party.writeShellScriptBin "rebuilder" ''
     set -ue
     if [[ $EUID -ne 0 ]]; then
       echo "Oh no! Only root is allowed to rebuild the system!" >&2
@@ -39,6 +37,6 @@ let
 in {
   inherit rebuilder;
 
-  nuggetSystem = systemFor [ pkgs.ops.nixos.nugget ];
-  camdenSystem = systemFor [ pkgs.ops.nixos.camden ];
+  nuggetSystem = systemFor [ depot.ops.nixos.nugget ];
+  camdenSystem = systemFor [ depot.ops.nixos.camden ];
 }
diff --git a/ops/nixos/nugget/default.nix b/ops/nixos/nugget/default.nix
index 4bc88d277b..877f7d4948 100644
--- a/ops/nixos/nugget/default.nix
+++ b/ops/nixos/nugget/default.nix
@@ -1,14 +1,13 @@
 # This file configures nugget, my home desktop machine.
-
-{ pkgs, lib, ... }:
+{ depot, lib, ... }:
 
 config: let
-  nixpkgs = import pkgs.third_party.nixpkgsSrc {
+  nixpkgs = import depot.third_party.nixpkgsSrc {
     config.allowUnfree = true;
   };
 
-  lieer = (pkgs.third_party.lieer {});
-in pkgs.lib.fix(self: {
+  lieer = (depot.third_party.lieer {});
+in depot.lib.fix(self: {
   imports = [
     ../modules/tailscale.nix
   ];
@@ -39,7 +38,7 @@ in pkgs.lib.fix(self: {
   nix = {
     nixPath = [
       "depot=/home/tazjin/depot"
-      "nixpkgs=${pkgs.third_party.nixpkgsSrc}"
+      "nixpkgs=${depot.third_party.nixpkgsSrc}"
     ];
   };
 
@@ -79,8 +78,8 @@ in pkgs.lib.fix(self: {
 
   # Generate an immutable /etc/resolv.conf from the nameserver settings
   # above (otherwise DHCP overwrites it):
-  environment.etc."resolv.conf" = with lib; with pkgs; {
-    source = writeText "resolv.conf" ''
+  environment.etc."resolv.conf" = with lib; {
+    source = depot.third_party.writeText "resolv.conf" ''
       ${concatStringsSep "\n" (map (ns: "nameserver ${ns}") self.networking.nameservers)}
       options edns0
     '';
@@ -90,7 +89,7 @@ in pkgs.lib.fix(self: {
 
   environment.systemPackages =
     # programs from the depot
-    (with pkgs; [
+    (with depot; [
       lieer
       ops.kontemplate
       third_party.git
@@ -217,9 +216,9 @@ in pkgs.lib.fix(self: {
         lightdm.greeters.gtk.clock-format = "%H·%M";
       };
 
-      windowManager.session = pkgs.lib.singleton {
+      windowManager.session = lib.singleton {
         name = "exwm";
-        start = "${pkgs.tools.emacs}/bin/tazjins-emacs";
+        start = "${depot.tools.emacs}/bin/tazjins-emacs";
       };
     };
 
@@ -251,7 +250,7 @@ in pkgs.lib.fix(self: {
       enable = true;
       relayConf = "/etc/tailscale/relay.conf";
       aclFile = null; # allow all traffic for testing
-      package = pkgs.third_party.tailscale;
+      package = depot.third_party.tailscale;
     };
 
     # ... and other nonsense.
diff --git a/ops/posix_mq.rs/default.nix b/ops/posix_mq.rs/default.nix
index 190a05c805..6b0e32009a 100644
--- a/ops/posix_mq.rs/default.nix
+++ b/ops/posix_mq.rs/default.nix
@@ -1,3 +1,3 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.third_party.naersk.buildPackage ./.
+depot.third_party.naersk.buildPackage ./.
diff --git a/ops/sync-gcsr/default.nix b/ops/sync-gcsr/default.nix
index ae88b34124..ea5d0594a8 100644
--- a/ops/sync-gcsr/default.nix
+++ b/ops/sync-gcsr/default.nix
@@ -1,10 +1,10 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.program {
+depot.nix.buildGo.program {
   name = "sync-gcsr";
   srcs = [ ./main.go ];
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     gopkgs."gopkg.in".src-d.go-git
   ];
 
diff --git a/overrides/default.nix b/overrides/default.nix
index 2159d45bd0..8bc49dec47 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -1,28 +1,13 @@
 # This file is used to move things from nested attribute sets to the
 # top-level.
-{ pkgs, ... }:
+{ depot, ... }:
 
 {
-  buildGo = pkgs.nix.buildGo;
-
-  # These packages must be exposed at the top-level for compatibility
-  # with Nixery.
-  inherit (pkgs.third_party)
-    bashInteractive
-    cacert
-    coreutils
-    iana-etc
-    jq
-    moreutils
-    nano
-    openssl
-    runCommand
-    symlinkJoin
-    writeText;
+  buildGo = depot.nix.buildGo; # TODO(tazjin): remove this
 
   # These packages must be exposed for compatibility with buildGo.
   #
   # Despite buildGo being tracked in this tree, I want it to be possible
   # for external users to import it with the default nixpkgs layout.
-  inherit (pkgs.third_party) go ripgrep;
+  inherit (depot.third_party) go ripgrep;
 }
diff --git a/overrides/elmPackages/default.nix b/overrides/elmPackages/default.nix
index 20026d9180..3df44420a6 100644
--- a/overrides/elmPackages/default.nix
+++ b/overrides/elmPackages/default.nix
@@ -2,7 +2,7 @@
 # the newer version is a lot of effort.
 { pkgs, ... }:
 
-(import (pkgs.third_party.fetchFromGitHub {
+(import (pkgs.fetchFromGitHub {
   owner = "NixOS";
   repo = "nixpkgs";
   rev = "14f9ee66e63077539252f8b4550049381a082518";
diff --git a/overrides/kontemplate/default.nix b/overrides/kontemplate/default.nix
index 52da1ba32c..6147d1f465 100644
--- a/overrides/kontemplate/default.nix
+++ b/overrides/kontemplate/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs;
+with depot;
 
 third_party.writeShellScriptBin "kontemplate" ''
   export PATH="${ops.kms_pass}/bin:$PATH"
diff --git a/overrides/writeElispBin/default.nix b/overrides/writeElispBin/default.nix
index a1616fb9d4..8fd61f3948 100644
--- a/overrides/writeElispBin/default.nix
+++ b/overrides/writeElispBin/default.nix
@@ -1,9 +1,9 @@
 { pkgs, ... }:
 
-{ name, src, deps ? (_: []), emacs ? pkgs.third_party.emacs26-nox }:
+{ name, src, deps ? (_: []), emacs ? pkgs.emacs26-nox }:
 
 let
-  inherit (pkgs.third_party) emacsPackagesNg emacsPackagesNgGen writeTextFile;
+  inherit (pkgs) emacsPackagesNg emacsPackagesNgGen writeTextFile;
   inherit (builtins) isString toFile;
 
   finalEmacs = (emacsPackagesNgGen emacs).emacsWithPackages deps;
diff --git a/presentations/bootstrapping-2018/default.nix b/presentations/bootstrapping-2018/default.nix
index 28296d8bf3..0dff14b2a1 100644
--- a/presentations/bootstrapping-2018/default.nix
+++ b/presentations/bootstrapping-2018/default.nix
@@ -2,7 +2,7 @@
 
 { pkgs, ... }:
 
-with pkgs.third_party;
+with pkgs;
 
 let tex = texlive.combine {
   inherit (texlive)
diff --git a/third_party/cgit/default.nix b/third_party/cgit/default.nix
index 7b1dfa8939..3e58816fc7 100644
--- a/third_party/cgit/default.nix
+++ b/third_party/cgit/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
 let
-  inherit (pkgs.third_party) stdenv gzip bzip2 xz luajit zlib autoconf openssl pkgconfig;
+  inherit (depot.third_party) stdenv gzip bzip2 xz luajit zlib autoconf openssl pkgconfig;
 in stdenv.mkDerivation rec {
   pname = "cgit";
   version = "master";
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
   # git version).
   preBuild = ''
     rm -rf git # remove submodule dir ...
-    cp -r --no-preserve=ownership,mode ${pkgs.third_party.git.src} git
+    cp -r --no-preserve=ownership,mode ${depot.third_party.git.src} git
     makeFlagsArray+=(prefix="$out" CGIT_SCRIPT_PATH="$out/cgit/")
   '';
 
diff --git a/third_party/default.nix b/third_party/default.nix
index 5bd96581c9..93930d57dc 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -2,8 +2,8 @@
 # third-party code) into my package tree.
 #
 # This includes *all packages needed from nixpkgs*.
+{ ... }:
 
-{ pkgs, ... }:
 let
   # Tracking nixos-unstable as of 2020-02-17.
   commit = "8130f3c1c2bb0e533b5e150c39911d6e61dcecc2";
diff --git a/third_party/emacs/carp-mode.nix b/third_party/emacs/carp-mode.nix
index 869cf05c19..9fab1f8663 100644
--- a/third_party/emacs/carp-mode.nix
+++ b/third_party/emacs/carp-mode.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-with pkgs.third_party;
+with pkgs;
 with emacsPackagesNg;
 
 melpaBuild rec {
diff --git a/third_party/git/default.nix b/third_party/git/default.nix
index fd847274e1..10e47fea26 100644
--- a/third_party/git/default.nix
+++ b/third_party/git/default.nix
@@ -1,8 +1,8 @@
 # Use the upstream git derivation (there's a lot of stuff happening in
 # there!) and just override the source:
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.third_party;
+with depot.third_party;
 
 (originals.git.overrideAttrs(_: {
   version = "2.23.0";
diff --git a/third_party/gopkgs/cloud.google.com/go/default.nix b/third_party/gopkgs/cloud.google.com/go/default.nix
index d3855291a9..d6c897f15e 100644
--- a/third_party/gopkgs/cloud.google.com/go/default.nix
+++ b/third_party/gopkgs/cloud.google.com/go/default.nix
@@ -1,12 +1,9 @@
 { pkgs, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "cloud.google.com/go";
   src = builtins.fetchGit {
     url = "https://code.googlesource.com/gocloud";
     rev = "4f03f8e4ba168c636e1c218da7ab41a1c8c0d8cf";
   };
-
-  deps = with pkgs.third_party; map (p: p.gopkg) [
-  ];
 }
diff --git a/third_party/gopkgs/github.com/emirpasic/gods/default.nix b/third_party/gopkgs/github.com/emirpasic/gods/default.nix
index 72979ef80d..c43485ee5f 100644
--- a/third_party/gopkgs/github.com/emirpasic/gods/default.nix
+++ b/third_party/gopkgs/github.com/emirpasic/gods/default.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "github.com/emirpasic/gods";
 
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "emirpasic";
     repo = "gods";
     rev = "4e23915b9a82f35f320a68a395a7a5045c826932";
diff --git a/third_party/gopkgs/github.com/golang/groupcache/default.nix b/third_party/gopkgs/github.com/golang/groupcache/default.nix
index 2dfa1241e9..8c0a639a32 100644
--- a/third_party/gopkgs/github.com/golang/groupcache/default.nix
+++ b/third_party/gopkgs/github.com/golang/groupcache/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "github.com/golang/groupcache";
   src = builtins.fetchGit {
     url = "https://github.com/golang/groupcache";
diff --git a/third_party/gopkgs/github.com/golang/protobuf/default.nix b/third_party/gopkgs/github.com/golang/protobuf/default.nix
index f1c54cd496..3a405181b2 100644
--- a/third_party/gopkgs/github.com/golang/protobuf/default.nix
+++ b/third_party/gopkgs/github.com/golang/protobuf/default.nix
@@ -1,12 +1,9 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "github.com/golang/protobuf";
   src = builtins.fetchGit {
     url = "https://github.com/golang/protobuf";
     rev = "ed6926b37a637426117ccab59282c3839528a700";
   };
-
-  deps = with pkgs.third_party; [
-  ];
 }
diff --git a/third_party/gopkgs/github.com/google/uuid/default.nix b/third_party/gopkgs/github.com/google/uuid/default.nix
index 8d60209681..f590b5749b 100644
--- a/third_party/gopkgs/github.com/google/uuid/default.nix
+++ b/third_party/gopkgs/github.com/google/uuid/default.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "github.com/google/uuid";
 
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "google";
     repo = "uuid";
     rev = "c2e93f3ae59f2904160ceaab466009f965df46d6";
diff --git a/third_party/gopkgs/github.com/googleapis/gax-go/default.nix b/third_party/gopkgs/github.com/googleapis/gax-go/default.nix
index fe694fdbbe..d897e155e9 100644
--- a/third_party/gopkgs/github.com/googleapis/gax-go/default.nix
+++ b/third_party/gopkgs/github.com/googleapis/gax-go/default.nix
@@ -1,16 +1,16 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
 let
-  inherit (pkgs) buildGo;
+  inherit (depot) buildGo;
   inherit (builtins) fetchGit;
-in pkgs.buildGo.external {
+in depot.buildGo.external {
   path = "github.com/googleapis/gax-go";
   src = fetchGit {
     url = "https://github.com/googleapis/gax-go";
     rev = "b443e5a67ec8eeac76f5f384004931878cab24b3";
   };
 
-  deps = with pkgs.third_party; [
+  deps = with depot.third_party; [
     gopkgs."golang.org".x.net.trace.gopkg
     gopkgs."google.golang.org".grpc.gopkg
     gopkgs."google.golang.org".grpc.codes.gopkg
diff --git a/third_party/gopkgs/github.com/hashicorp/golang-lru/default.nix b/third_party/gopkgs/github.com/hashicorp/golang-lru/default.nix
index 04efc3144d..4e8073f93a 100644
--- a/third_party/gopkgs/github.com/hashicorp/golang-lru/default.nix
+++ b/third_party/gopkgs/github.com/hashicorp/golang-lru/default.nix
@@ -1,13 +1,13 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "github.com/hashicorp/golang-lru";
   src = builtins.fetchGit {
     url = "https://github.com/hashicorp/golang-lru";
     rev = "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d";
   };
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     gopkgs."golang.org".x.net.context.ctxhttp
     gopkgs."cloud.google.com".go.compute.metadata
   ];
diff --git a/third_party/gopkgs/github.com/jbenet/go-context/default.nix b/third_party/gopkgs/github.com/jbenet/go-context/default.nix
index 454b27312a..4092f8ecff 100644
--- a/third_party/gopkgs/github.com/jbenet/go-context/default.nix
+++ b/third_party/gopkgs/github.com/jbenet/go-context/default.nix
@@ -1,16 +1,16 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "github.com/jbenet/go-context";
 
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "jbenet";
     repo = "go-context";
     rev = "d14ea06fba99483203c19d92cfcd13ebe73135f4";
     sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl";
   };
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     gopkgs."golang.org".x.net.context
   ];
 }
diff --git a/third_party/gopkgs/github.com/kevinburke/ssh_config/default.nix b/third_party/gopkgs/github.com/kevinburke/ssh_config/default.nix
index ed8dadc40c..a3371dea22 100644
--- a/third_party/gopkgs/github.com/kevinburke/ssh_config/default.nix
+++ b/third_party/gopkgs/github.com/kevinburke/ssh_config/default.nix
@@ -1,15 +1,12 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "github.com/kevinburke/ssh_config";
 
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "kevinburke";
     repo = "ssh_config";
     rev = "01f96b0aa0cdcaa93f9495f89bbc6cb5a992ce6e";
     sha256 = "1bxfjkjl3ibzdkwyvgdwawmd0skz30ah1ha10rg6fkxvj7lgg4jz";
   };
-
-  deps = with pkgs.third_party; map (p: p.gopkg) [
-  ];
 }
diff --git a/third_party/gopkgs/github.com/mitchellh/go-homedir/default.nix b/third_party/gopkgs/github.com/mitchellh/go-homedir/default.nix
index 0d94f6cf6e..974f39c919 100644
--- a/third_party/gopkgs/github.com/mitchellh/go-homedir/default.nix
+++ b/third_party/gopkgs/github.com/mitchellh/go-homedir/default.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "github.com/mitchellh/go-homedir";
 
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "mitchellh";
     repo = "go-homedir";
     rev = "af06845cf3004701891bf4fdb884bfe4920b3727";
diff --git a/third_party/gopkgs/github.com/sergi/go-diff/default.nix b/third_party/gopkgs/github.com/sergi/go-diff/default.nix
index 45f6889151..c789fc5815 100644
--- a/third_party/gopkgs/github.com/sergi/go-diff/default.nix
+++ b/third_party/gopkgs/github.com/sergi/go-diff/default.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "github.com/sergi/go-diff";
 
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "sergi";
     repo = "go-diff";
     rev = "58c5cb1602ee9676b5d3590d782bedde80706fcc";
diff --git a/third_party/gopkgs/github.com/src-d/gcfg/default.nix b/third_party/gopkgs/github.com/src-d/gcfg/default.nix
index 5dde56d5f3..2906063428 100644
--- a/third_party/gopkgs/github.com/src-d/gcfg/default.nix
+++ b/third_party/gopkgs/github.com/src-d/gcfg/default.nix
@@ -1,16 +1,16 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "github.com/src-d/gcfg";
 
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "src-d";
     repo = "gcfg";
     rev = "1ac3a1ac202429a54835fe8408a92880156b489d";
     sha256 = "044j95skmyrwjw5fwjk6ka32rjgsg0ar0mfp9np19sh1acwv4x4r";
   };
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     gopkgs."gopkg.in".warnings
   ];
 }
diff --git a/third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix b/third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix
index e179618a72..b52165efe3 100644
--- a/third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix
+++ b/third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix
@@ -1,16 +1,16 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "github.com/xanzy/ssh-agent";
 
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "xanzy";
     repo = "ssh-agent";
     rev = "6a3e2ff9e7c564f36873c2e36413f634534f1c44";
     sha256 = "1chjlnv5d6svpymxgsr62d992m2xi6jb5lybjc5zn1h3hv1m01av";
   };
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     gopkgs."golang.org".x.crypto.ssh.agent
   ];
 }
diff --git a/third_party/gopkgs/go.opencensus.io/default.nix b/third_party/gopkgs/go.opencensus.io/default.nix
index 4cab5e5dce..af9690880f 100644
--- a/third_party/gopkgs/go.opencensus.io/default.nix
+++ b/third_party/gopkgs/go.opencensus.io/default.nix
@@ -1,13 +1,13 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "go.opencensus.io";
   src = builtins.fetchGit {
     url = "https://github.com/census-instrumentation/opencensus-go";
     rev = "643eada29081047b355cfaa1ceb9bc307a10423c";
   };
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     gopkgs."github.com".hashicorp.golang-lru.simplelru
     gopkgs."github.com".golang.groupcache.lru
   ];
diff --git a/third_party/gopkgs/golang.org/x/crypto/default.nix b/third_party/gopkgs/golang.org/x/crypto/default.nix
index 11c9b0ea8b..2129f8b538 100644
--- a/third_party/gopkgs/golang.org/x/crypto/default.nix
+++ b/third_party/gopkgs/golang.org/x/crypto/default.nix
@@ -1,13 +1,13 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "golang.org/x/crypto";
   src = builtins.fetchGit {
     url = "https://go.googlesource.com/crypto";
     rev = "e9b2fee46413994441b28dfca259d911d963dfed";
   };
 
-  deps = with pkgs.third_party; [
+  deps = with depot.third_party; [
     gopkgs."golang.org".x.sys.unix.gopkg
   ];
 }
diff --git a/third_party/gopkgs/golang.org/x/net/default.nix b/third_party/gopkgs/golang.org/x/net/default.nix
index 400ba6922b..450369d694 100644
--- a/third_party/gopkgs/golang.org/x/net/default.nix
+++ b/third_party/gopkgs/golang.org/x/net/default.nix
@@ -1,13 +1,13 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "golang.org/x/net";
   src = builtins.fetchGit {
     url = "https://go.googlesource.com/net";
     rev = "c0dbc17a35534bf2e581d7a942408dc936316da4";
   };
 
-  deps = with pkgs.third_party; [
+  deps = with depot.third_party; [
     gopkgs."golang.org".x.text.secure.bidirule.gopkg
     gopkgs."golang.org".x.text.unicode.bidi.gopkg
     gopkgs."golang.org".x.text.unicode.norm.gopkg
diff --git a/third_party/gopkgs/golang.org/x/oauth2/default.nix b/third_party/gopkgs/golang.org/x/oauth2/default.nix
index f5e783b6d1..230e629672 100644
--- a/third_party/gopkgs/golang.org/x/oauth2/default.nix
+++ b/third_party/gopkgs/golang.org/x/oauth2/default.nix
@@ -1,13 +1,13 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "golang.org/x/oauth2";
   src = builtins.fetchGit {
     url = "https://go.googlesource.com/oauth2";
     rev = "858c2ad4c8b6c5d10852cb89079f6ca1c7309787";
   };
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     gopkgs."golang.org".x.net.context.ctxhttp
     gopkgs."cloud.google.com".go.compute.metadata
   ];
diff --git a/third_party/gopkgs/golang.org/x/sys/default.nix b/third_party/gopkgs/golang.org/x/sys/default.nix
index 5655c08d82..2d45b6286d 100644
--- a/third_party/gopkgs/golang.org/x/sys/default.nix
+++ b/third_party/gopkgs/golang.org/x/sys/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "golang.org/x/sys";
   src = builtins.fetchGit {
     url = "https://go.googlesource.com/sys";
diff --git a/third_party/gopkgs/golang.org/x/text/default.nix b/third_party/gopkgs/golang.org/x/text/default.nix
index 409b0d0b9e..84753e5362 100644
--- a/third_party/gopkgs/golang.org/x/text/default.nix
+++ b/third_party/gopkgs/golang.org/x/text/default.nix
@@ -1,12 +1,9 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "golang.org/x/text";
   src = builtins.fetchGit {
     url = "https://go.googlesource.com/text";
     rev = "cbf43d21aaebfdfeb81d91a5f444d13a3046e686";
   };
-
-  deps = with pkgs.third_party; [
-  ];
 }
diff --git a/third_party/gopkgs/golang.org/x/time/default.nix b/third_party/gopkgs/golang.org/x/time/default.nix
index 6ccfc8a652..0c8aaeab98 100644
--- a/third_party/gopkgs/golang.org/x/time/default.nix
+++ b/third_party/gopkgs/golang.org/x/time/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "golang.org/x/time";
 
   src = builtins.fetchGit {
diff --git a/third_party/gopkgs/google.golang.org/api/default.nix b/third_party/gopkgs/google.golang.org/api/default.nix
index a4e7339a3f..333b9df157 100644
--- a/third_party/gopkgs/google.golang.org/api/default.nix
+++ b/third_party/gopkgs/google.golang.org/api/default.nix
@@ -1,13 +1,13 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "google.golang.org/api";
   src = builtins.fetchGit {
     url = "https://code.googlesource.com/google-api-go-client";
     rev = "8b4e46d953bd748a9ff098644a42389b3d8dab41";
   };
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     gopkgs."github.com".googleapis.gax-go.v2
     gopkgs."golang.org".x.oauth2.google
     gopkgs."golang.org".x.oauth2
diff --git a/third_party/gopkgs/google.golang.org/genproto/default.nix b/third_party/gopkgs/google.golang.org/genproto/default.nix
index 50280296b8..e3b0a2065a 100644
--- a/third_party/gopkgs/google.golang.org/genproto/default.nix
+++ b/third_party/gopkgs/google.golang.org/genproto/default.nix
@@ -1,13 +1,13 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "google.golang.org/genproto";
   src = builtins.fetchGit {
     url = "https://github.com/google/go-genproto";
     rev = "0243a4be9c8f1264d238fdc2895620b4d9baf9e1";
   };
 
-  deps = with pkgs.third_party; [
+  deps = with depot.third_party; [
     gopkgs."github.com".golang.protobuf.proto.gopkg
     gopkgs."github.com".golang.protobuf.ptypes.any.gopkg
   ];
diff --git a/third_party/gopkgs/google.golang.org/grpc/default.nix b/third_party/gopkgs/google.golang.org/grpc/default.nix
index badc811c9f..8b533c9077 100644
--- a/third_party/gopkgs/google.golang.org/grpc/default.nix
+++ b/third_party/gopkgs/google.golang.org/grpc/default.nix
@@ -1,13 +1,13 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "google.golang.org/grpc";
   src = builtins.fetchGit {
     url = "https://github.com/grpc/grpc-go";
     rev = "085c980048876e2735d4aba8f0d5bca4d7acaaa5";
   };
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     gopkgs."golang.org".x.net.trace
     gopkgs."golang.org".x.net.http2
     gopkgs."golang.org".x.net.http2.hpack
diff --git a/third_party/gopkgs/googlemaps.github.io/maps.nix b/third_party/gopkgs/googlemaps.github.io/maps.nix
index 4c0ee4fb6d..20db836aa7 100644
--- a/third_party/gopkgs/googlemaps.github.io/maps.nix
+++ b/third_party/gopkgs/googlemaps.github.io/maps.nix
@@ -1,16 +1,16 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.nix.buildGo.external {
   path = "googlemaps.github.io/maps";
 
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "googlemaps";
     repo = "google-maps-services-go";
     rev = "a46d9fca56ac82caa79408b2417ea93a75e3b986";
     sha256 = "1zpl85yd3m417060isdlhxzakqkf4f59jgpz3kcjp2i0mkrskkjs";
   };
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     gopkgs."github.com".google.uuid
     gopkgs."golang.org".x.time.rate
   ];
diff --git a/third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix b/third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix
index 4272ed7d67..0ed4e343e1 100644
--- a/third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix
+++ b/third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix
@@ -1,16 +1,16 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "gopkg.in/src-d/go-billy.v4";
 
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "src-d";
     repo = "go-billy";
     rev = "fd409ff12f33d0d60af0ce0abeb8d93df360af49";
     sha256 = "1j0pl6ggzmd2lrqj71vmsnl6cqm43145h7yg6sy3j5n7hhd592qv";
   };
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     gopkgs."golang.org".x.sys.unix
   ];
 }
diff --git a/third_party/gopkgs/gopkg.in/src-d/go-git/default.nix b/third_party/gopkgs/gopkg.in/src-d/go-git/default.nix
index 75d053f777..a39b7e82b7 100644
--- a/third_party/gopkgs/gopkg.in/src-d/go-git/default.nix
+++ b/third_party/gopkgs/gopkg.in/src-d/go-git/default.nix
@@ -1,18 +1,18 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   # .v4 is used throughout the codebase and I can't be bothered to do
   # anything else about it other than using that package path here.
   path = "gopkg.in/src-d/go-git.v4";
 
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "src-d";
     repo = "go-git";
     rev = "1a7db85bca7027d90afdb5ce711622aaac9feaed";
     sha256 = "08jl4ljrzzil7c3qcl2y1859nhpgw9ixxy1g40ff7kmq989yhs6v";
   };
 
-  deps = with pkgs.third_party; map (p: p.gopkg) [
+  deps = with depot.third_party; map (p: p.gopkg) [
     gopkgs."github.com".emirpasic.gods.trees.binaryheap
     gopkgs."github.com".jbenet.go-context.io
     gopkgs."github.com".kevinburke.ssh_config
diff --git a/third_party/gopkgs/gopkg.in/warnings/default.nix b/third_party/gopkgs/gopkg.in/warnings/default.nix
index 1299c2b541..0ea28cce57 100644
--- a/third_party/gopkgs/gopkg.in/warnings/default.nix
+++ b/third_party/gopkgs/gopkg.in/warnings/default.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.buildGo.external {
+depot.buildGo.external {
   path = "gopkg.in/warnings.v0";
 
-  src = pkgs.third_party.fetchFromGitHub {
+  src = depot.third_party.fetchFromGitHub {
     owner = "go-warnings";
     repo = "warnings";
     rev = "27b9fabbdaf131d2169ec3ff7db8ffc4d839635e";
diff --git a/third_party/guile/default.nix b/third_party/guile/default.nix
index 7a54a7cd92..1fd8535478 100644
--- a/third_party/guile/default.nix
+++ b/third_party/guile/default.nix
@@ -1,11 +1,11 @@
 # Override Guile to version 3.0.0
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.third_party.originals.guile.overrideAttrs(old: rec {
+depot.third_party.originals.guile.overrideAttrs(old: rec {
   name = "guile-${version}";
   version = "3.0.0";
 
-  src = pkgs.third_party.fetchurl {
+  src = depot.third_party.fetchurl {
     url = "mirror://gnu/guile/${name}.tar.xz";
     sha256 = "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9";
   };
diff --git a/third_party/lieer/default.nix b/third_party/lieer/default.nix
index 2f58d5f117..6dd4cecd1d 100644
--- a/third_party/lieer/default.nix
+++ b/third_party/lieer/default.nix
@@ -17,7 +17,7 @@
   project ? "tazjins-infrastructure"
 }:
 
-with pkgs.third_party;
+with pkgs;
 
 let
   authPatch = runCommand "client_secret.patch" {} ''
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
diff --git a/third_party/naersk/default.nix b/third_party/naersk/default.nix
index 2da96d8266..0b86f9a64f 100644
--- a/third_party/naersk/default.nix
+++ b/third_party/naersk/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-let inherit (pkgs.third_party) callPackage fetchFromGitHub;
+let inherit (depot.third_party) callPackage fetchFromGitHub;
 in callPackage (fetchFromGitHub {
   owner = "nmattia";
   repo = "naersk";
diff --git a/third_party/nixery/default.nix b/third_party/nixery/default.nix
index 7ef7b644f8..4b894ce1dd 100644
--- a/third_party/nixery/default.nix
+++ b/third_party/nixery/default.nix
@@ -2,14 +2,14 @@
 # outside of this repository ...
 { pkgs, ... }:
 
-let src = pkgs.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "google";
   repo = "nixery";
   rev = "4f6ce83f9296545d6c74321b37d18545764c8827";
   sha256 = "19aiak1pss6vwm0fwn02827l5ir78fkqglfbdl2gchsyv3gps8bg";
 };
 in import src {
-  pkgs = pkgs.third_party;
+  inherit pkgs;
   preLaunch = ''
     export USER=root
     cachix use tazjin
diff --git a/third_party/notmuch/default.nix b/third_party/notmuch/default.nix
index ddb764b0ae..8e1e9c2626 100644
--- a/third_party/notmuch/default.nix
+++ b/third_party/notmuch/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-pkgs.third_party.originals.notmuch.overrideAttrs(old: {
+pkgs.originals.notmuch.overrideAttrs(old: {
   doCheck = false;
   patches = [ ./dottime.patch ] ++ (if old ? patches then old.patches else []);
 })
diff --git a/third_party/ormolu/default.nix b/third_party/ormolu/default.nix
index eed5c7981e..3175e25ff1 100644
--- a/third_party/ormolu/default.nix
+++ b/third_party/ormolu/default.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }:
 
-import (pkgs.third_party.fetchFromGitHub {
+import (pkgs.fetchFromGitHub {
   owner = "tweag";
   repo = "ormolu";
   rev = "a7076c0f83e5c06ea9067b71171859fa2ba8afd9";
   sha256 = "1p4n2ja4ciw3qfskn65ggpy37mvgf2sslxqmqn8s8jjarnqcyfny";
-}) { pkgs = pkgs.third_party; }
+}) { inherit pkgs; }
diff --git a/third_party/pounce/default.nix b/third_party/pounce/default.nix
index 1aab276b74..6e4feffe7c 100644
--- a/third_party/pounce/default.nix
+++ b/third_party/pounce/default.nix
@@ -4,7 +4,7 @@
 # nixos-unstable.
 { pkgs, ... }:
 
-with pkgs.third_party;
+with pkgs;
 
 originals.pounce.overrideAttrs(old: rec {
   version = "1.1";
diff --git a/third_party/tailscale/default.nix b/third_party/tailscale/default.nix
index fe6721457d..9f26d8f76a 100644
--- a/third_party/tailscale/default.nix
+++ b/third_party/tailscale/default.nix
@@ -4,7 +4,7 @@
 { pkgs, lib, ... }:
 
 let
-  inherit (pkgs.third_party) buildGoModule fetchFromGitHub;
+  inherit (pkgs) buildGoModule fetchFromGitHub;
 in buildGoModule rec {
   pname = "tailscale";
   version = "fef25489";
diff --git a/third_party/telega/default.nix b/third_party/telega/default.nix
index 4fdf0667ff..b15f74b829 100644
--- a/third_party/telega/default.nix
+++ b/third_party/telega/default.nix
@@ -2,7 +2,7 @@
 # component to run correctly, which is built by this derivation.
 { pkgs, ... }:
 
-with pkgs.third_party;
+with pkgs;
 
 stdenv.mkDerivation {
   name = "telega";
diff --git a/third_party/terraform-gcp/default.nix b/third_party/terraform-gcp/default.nix
index 465b74e4e1..3332c12e41 100644
--- a/third_party/terraform-gcp/default.nix
+++ b/third_party/terraform-gcp/default.nix
@@ -1,3 +1,3 @@
 { pkgs, ... }:
 
-pkgs.third_party.terraform_0_12.withPlugins(p: [ p.google p.google-beta ])
+pkgs.terraform_0_12.withPlugins(p: [ p.google p.google-beta ])
diff --git a/tools/cheddar/default.nix b/tools/cheddar/default.nix
index ed4814be0a..5f209090e3 100644
--- a/tools/cheddar/default.nix
+++ b/tools/cheddar/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.third_party;
+with depot.third_party;
 
 naersk.buildPackage {
   src = ./.;
diff --git a/tools/emacs-pkgs/dottime/default.nix b/tools/emacs-pkgs/dottime/default.nix
index b09756dea5..97b5581070 100644
--- a/tools/emacs-pkgs/dottime/default.nix
+++ b/tools/emacs-pkgs/dottime/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-pkgs.third_party.emacsPackagesNg.trivialBuild rec {
+pkgs.emacsPackagesNg.trivialBuild rec {
   pname = "dottime";
   version = "1.0";
   src = ./dottime.el;
diff --git a/tools/emacs-pkgs/nix-util/default.nix b/tools/emacs-pkgs/nix-util/default.nix
index 0e314ae719..57c18cf8d7 100644
--- a/tools/emacs-pkgs/nix-util/default.nix
+++ b/tools/emacs-pkgs/nix-util/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-pkgs.third_party.emacsPackagesNg.trivialBuild rec {
+pkgs.emacsPackagesNg.trivialBuild rec {
   pname = "nix-util";
   version = "1.0";
   src = ./nix-util.el;
diff --git a/tools/emacs-pkgs/term-switcher/default.nix b/tools/emacs-pkgs/term-switcher/default.nix
index 09b5353dc4..b1f1a47861 100644
--- a/tools/emacs-pkgs/term-switcher/default.nix
+++ b/tools/emacs-pkgs/term-switcher/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-with pkgs.third_party.emacsPackagesNg;
+with pkgs.emacsPackagesNg;
 
 melpaBuild rec {
   pname = "term-switcher";
diff --git a/tools/emacs/default.nix b/tools/emacs/default.nix
index dda7788b43..099cc65052 100644
--- a/tools/emacs/default.nix
+++ b/tools/emacs/default.nix
@@ -7,9 +7,9 @@
 # Forcing Emacs to link against Imagemagick currently causes libvterm
 # to segfault, which is a lot less desirable than not having telega
 # render images correctly.
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs;
+with depot;
 with third_party.emacsPackagesNg;
 with third_party.emacs;
 
@@ -115,7 +115,7 @@ let
   ]) ++
 
   # Custom packages
-  (with pkgs.tools.emacs-pkgs; [
+  (with depot.tools.emacs-pkgs; [
     carp-mode
     exwmMaster
     dottime
diff --git a/web/blog/default.nix b/web/blog/default.nix
index a8e48a9d68..d2f04aaea5 100644
--- a/web/blog/default.nix
+++ b/web/blog/default.nix
@@ -2,9 +2,9 @@
 # files in this repository.
 #
 # All blog posts are rendered from Markdown by cheddar.
-{ pkgs, lib, ... }@args:
+{ depot, lib, ... }@args:
 
-with pkgs.nix.yants;
+with depot.nix.yants;
 
 let
   inherit (builtins) filter hasAttr map;
@@ -33,7 +33,7 @@ let
   posts = list post (import ./posts.nix);
   fragments = import ./fragments.nix args;
 
-  rendered = pkgs.third_party.runCommandNoCC "tazjins-blog" {} ''
+  rendered = depot.third_party.runCommandNoCC "tazjins-blog" {} ''
     mkdir -p $out
 
     ${lib.concatStringsSep "\n" (map (post:
diff --git a/web/blog/fragments.nix b/web/blog/fragments.nix
index b13ba20c66..18416e4c4d 100644
--- a/web/blog/fragments.nix
+++ b/web/blog/fragments.nix
@@ -6,11 +6,11 @@
 # fragments together in a runCommand execution.
 #
 # The post index is generated by //web/homepage, not by this code.
-{ pkgs, lib, ... }:
+{ depot, lib, ... }:
 
 let
   inherit (builtins) filter map hasAttr replaceStrings toFile;
-  inherit (pkgs.third_party) runCommandNoCC writeText;
+  inherit (depot.third_party) runCommandNoCC writeText;
 
   # Generate a post list for all listed, non-draft posts.
   isDraft = post: (hasAttr "draft" post) && post.draft;
@@ -86,7 +86,7 @@ let
     }
 
     # Write the actual post through cheddar's about-filter mechanism
-    cat ${post.content} | ${pkgs.tools.cheddar}/bin/cheddar --about-filter ${post.content} >> $out
+    cat ${post.content} | ${depot.tools.cheddar}/bin/cheddar --about-filter ${post.content} >> $out
     echo '</article>' >> $out
 
     cat ${toFile "footer.html" footer} >> $out
diff --git a/web/cgit-taz/default.nix b/web/cgit-taz/default.nix
index 21f19eaa7d..d18c782907 100644
--- a/web/cgit-taz/default.nix
+++ b/web/cgit-taz/default.nix
@@ -4,13 +4,13 @@
 # In the first round this will just serve my GitHub repositories until
 # I'm happy with the display.
 
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.third_party;
+with depot.third_party;
 
 let
   sourceFilter = writeShellScriptBin "cheddar-about" ''
-    exec ${pkgs.tools.cheddar}/bin/cheddar --about-filter $@
+    exec ${depot.tools.cheddar}/bin/cheddar --about-filter $@
   '';
   cgitConfig = writeText "cgitrc" ''
     # Global configuration
@@ -18,7 +18,7 @@ let
     enable-http-clone=1
     readme=:README.md
     about-filter=${sourceFilter}/bin/cheddar-about
-    source-filter=${pkgs.tools.cheddar}/bin/cheddar
+    source-filter=${depot.tools.cheddar}/bin/cheddar
     enable-log-filecount=1
     enable-log-linecount=1
     enable-follow-links=1
diff --git a/web/homepage/default.nix b/web/homepage/default.nix
index 3c1e75f8f3..22380fdea7 100644
--- a/web/homepage/default.nix
+++ b/web/homepage/default.nix
@@ -5,9 +5,9 @@
 # elements for things such as blog posts and projects.
 #
 # Content for the blog is in //web/blog instead of here.
-{ pkgs, lib, ... }:
+{ depot, lib, ... }:
 
-with pkgs;
+with depot;
 with nix.yants;
 
 let
diff --git a/web/tazblog_lisp/default.nix b/web/tazblog_lisp/default.nix
index 178c731ccb..b5527c196d 100644
--- a/web/tazblog_lisp/default.nix
+++ b/web/tazblog_lisp/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.nix.buildLisp.library {
+depot.nix.buildLisp.library {
   name = "tazblog";
 
   deps =