refactor(third_party): Consistent use of depot.third_party vs. pkgs

In preparation for the solution of b/108, we need to consistently use
`depot.third_party` for packages that are only packed in the TVL depot
and `pkgs` for things that come from nixpkgs.

This commit cleans up a huge chunk of these uses in //third_party

Change-Id: Ic382c0cdea7330a84d5f0b7d109c824ddceb94e7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2912
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>

third_party/lisp/checkl.nix

@@ -12,7 +12,7 @@ let
 
 in depot.nix.buildLisp.library {
   name = "checkl";
-  deps = with pkgs.lisp; [
+  deps = with depot.third_party.lisp; [
     (bundled "asdf")
     marshal
     fiveam

third_party/lisp/chipz.nix

@@ -1,17 +1,15 @@
 # Common Lisp library for decompressing deflate, zlib, gzip, and bzip2 data
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-with depot.nix;
-
-let src = depot.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "froydnj";
   repo = "chipz";
   rev = "75dfbc660a5a28161c57f115adf74c8a926bfc4d";
   sha256 = "0plx4rs39zbs4gjk77h4a2q11zpy75fh9v8hnxrvsf8fnakajhwg";
 };
-in buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "chipz";
-  deps = [ (buildLisp.bundled "asdf") ];
+  deps = [ (depot.nix.buildLisp.bundled "asdf") ];
 
   srcs = map (f: src + ("/" + f)) [
     "chipz.asd"

third_party/lisp/chunga.nix

@@ -1,7 +1,7 @@
 # Portable chunked streams for Common Lisp
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-let src = depot.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "edicl";
   repo = "chunga";
   rev = "16330852d01dfde4dd97dee7cd985a88ea571e7e";

third_party/lisp/cl-fad.nix

@@ -1,9 +1,9 @@
 # Portable pathname library
-{ depot, ...}:
+{ depot, pkgs, ...}:
 
 with depot.nix;
 
-let src = depot.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "edicl";
   repo = "cl-fad";
   rev = "c13d81c4bd9ba3a172631fd05dd213ab90e7d4cb";

third_party/lisp/cl-json.nix

@@ -1,13 +1,15 @@
 # JSON encoder & decoder
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-with depot.nix;
-let src = depot.third_party.fetchFromGitHub {
-  owner = "hankhero";
-  repo = "cl-json";
-  rev = "6dfebb9540bfc3cc33582d0c03c9ec27cb913e79";
-  sha256 = "0fx3m3x3s5ji950yzpazz4s0img3l6b3d6l3jrfjv0lr702496lh";
-};
+let
+  inherit (depot.nix) buildLisp;
+
+  src = pkgs.fetchFromGitHub {
+    owner = "hankhero";
+    repo = "cl-json";
+    rev = "6dfebb9540bfc3cc33582d0c03c9ec27cb913e79";
+    sha256 = "0fx3m3x3s5ji950yzpazz4s0img3l6b3d6l3jrfjv0lr702496lh";
+  };
 in buildLisp.library {
   name = "cl-json";
   deps = [ (buildLisp.bundled "asdf") ];

third_party/lisp/cl-plus-ssl.nix

@@ -1,5 +1,5 @@
 # Common Lisp bindings to OpenSSL
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 with depot.nix;
 
@@ -21,7 +21,7 @@ in buildLisp.library {
     (buildLisp.bundled "sb-posix")
   ];
 
-  native = [ depot.third_party.openssl ];
+  native = [ pkgs.openssl ];
 
   srcs = map (f: src + ("/src/" + f)) [
     "package.lisp"

third_party/lisp/cl-prevalence.nix

@@ -1,8 +1,8 @@
 # cl-prevalence is an implementation of object prevalence for CL (i.e.
 # an in-memory database)
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-let src = depot.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "40ants";
   repo = "cl-prevalence";
   rev = "da3ed6c4594b1c2fca90c178c1993973c4bf16c9";

third_party/lisp/cl-smtp.nix

@@ -11,7 +11,7 @@ let
 
 in depot.nix.buildLisp.library {
   name = "cl-smtp";
-  deps = with pkgs.lisp; [
+  deps = with depot.third_party.lisp; [
     usocket
     trivial-gray-streams
     flexi-streams

third_party/lisp/closer-mop.nix

@@ -1,9 +1,9 @@
 # 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
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-let src = depot.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "pcostanza";
   repo = "closer-mop";
   rev = "e1d1430524086709a7ea8e0eede6849aa29d6276";

third_party/lisp/drakma.nix

@@ -1,15 +1,13 @@
 # Drakma is an HTTP client for Common Lisp.
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-with depot.nix;
-
-let src = depot.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "edicl";
   repo = "drakma";
   rev = "87feb02bef00b11a753d5fb21a5fec526b0d0bbb";
   sha256 = "01b80am2vrw94xmdj7f21qm7p5ys08mmpzv4nc4icql81hqr1w2m";
 };
-in buildLisp.library {
+in depot.nix.buildLisp.library {
   name = "drakma";
   deps = with depot.third_party.lisp; [
     chipz
@@ -20,7 +18,7 @@ in buildLisp.library {
     flexi-streams
     puri
     usocket
-    (buildLisp.bundled "asdf")
+    (depot.nix.buildLisp.bundled "asdf")
   ];
 
   srcs = map (f: src + ("/" + f)) [

third_party/lisp/hunchentoot.nix

@@ -1,8 +1,8 @@
 # Hunchentoot is a web framework for Common Lisp.
-{ depot, ...}:
+{ depot, pkgs, ...}:
 
 let
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "edicl";
     repo = "hunchentoot";
     rev = "585b45b6b873f2da421fdf456b61860ab5868207";

third_party/lisp/lisp-binary.nix

@@ -1,7 +1,7 @@
 # A library to easily read and write complex binary formats.
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-let src = depot.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "j3pic";
   repo = "lisp-binary";
   rev = "1aefc8618b7734f68697ddf59bc93cb8522aa0bf";

third_party/lisp/local-time.nix

@@ -1,7 +1,7 @@
 # Library for manipulating dates & times
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-let src = depot.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "dlowe-net";
   repo = "local-time";
   rev = "dc54f61415c76ee755a6f69d4154a3a282f2789f";

third_party/lisp/md5.nix

@@ -1,9 +1,9 @@
 # MD5 hash implementation
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 with depot.nix;
 
-let src = depot.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "pmai";
   repo = "md5";
   rev = "b1412600f60d526ee34a7ba1596ec483da7894ab";

third_party/lisp/moptilities.nix

@@ -1,7 +1,7 @@
 # Compatibility layer for minor MOP implementation differences
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-let src = depot.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "gwkkwg";
   repo = "moptilities";
   rev = "a436f16b357c96b82397ec018ea469574c10dd41";

third_party/lisp/postmodern.nix

@@ -12,7 +12,7 @@ let
 
   cl-postgres = depot.nix.buildLisp.library {
     name = "cl-postgres";
-    deps = with pkgs.lisp; [
+    deps = with depot.third_party.lisp; [
       md5
       split-sequence
       ironclad
@@ -44,7 +44,7 @@ let
 
   s-sql = depot.nix.buildLisp.library {
     name = "s-sql";
-    deps = with pkgs.lisp; [
+    deps = with depot.third_party.lisp; [
       cl-postgres
       alexandria
     ];
@@ -58,7 +58,7 @@ let
   postmodern = depot.nix.buildLisp.library {
     name = "postmodern";
 
-    deps = with pkgs.lisp; [
+    deps = with depot.third_party.lisp; [
       alexandria
       cl-postgres
       s-sql

third_party/lisp/puri.nix

@@ -1,7 +1,7 @@
 # Portable URI library
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-let src = depot.third_party.fetchgit {
+let src = pkgs.fetchgit {
   url = "http://git.kpe.io/puri.git";
   rev = "4bbab89d9ccbb26346899d1f496c97604fec567b";
   sha256 = "0gq2rsr0aihs0z20v4zqvmdl4szq53b52rh97pvnmwrlbn4mapmd";

third_party/lisp/rfc2388.nix

@@ -1,7 +1,7 @@
 # Implementation of RFC2388 (multipart/form-data)
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-let src = depot.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "jdz";
   repo = "rfc2388";
   rev = "591bcf7e77f2c222c43953a80f8c297751dc0c4e";

third_party/lisp/s-sysdeps.nix

@@ -1,7 +1,7 @@
 # A Common Lisp abstraction layer over platform dependent functionality.
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-let src = depot.third_party.fetchFromGitHub {
+let src = pkgs.fetchFromGitHub {
   owner = "svenvc";
   repo = "s-sysdeps";
   rev = "d28246b5dffef9e73a0e0e6cfbc4e878006fe34d";

third_party/lisp/trivial-ldap.nix

@@ -9,7 +9,7 @@ let src = pkgs.fetchFromGitHub {
 in depot.nix.buildLisp.library {
   name = "trivial-ldap";
 
-  deps = with pkgs.lisp; [
+  deps = with depot.third_party.lisp; [
     usocket
     cl-plus-ssl
     cl-yacc

third_party/lisp/uax-15.nix

@@ -16,7 +16,7 @@ let
 in depot.nix.buildLisp.library {
   name = "uax-15";
 
-  deps = with pkgs.lisp; [
+  deps = with depot.third_party.lisp; [
     split-sequence
     cl-ppcre
     (bundled "uiop")

third_party/lisp/unix-opts.nix

@@ -1,8 +1,8 @@
 # unix-opts is a portable command line argument parser
-{ depot, ...}:
+{ depot, pkgs, ...}:
 
 let
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "libre-man";
     repo = "unix-opts";
     rev = "b805050b074bd860edd18cfc8776fdec666ec36e";

third_party/lisp/usocket.nix

@@ -1,14 +1,15 @@
 # Usocket is a portable socket library
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
-with depot.nix;
+let
+  inherit (depot.nix) buildLisp;
 
-let src = depot.third_party.fetchFromGitHub {
-  owner = "usocket";
-  repo = "usocket";
-  rev = "fdf4fd1e0051ce83340ccfbbc8a43a462bb19cf2";
-  sha256 = "0x746wr2324l6bn7skqzgkzcbj5kd0zp2ck0c8rldrw0rzabg826";
-};
+  src = pkgs.fetchFromGitHub {
+    owner = "usocket";
+    repo = "usocket";
+    rev = "fdf4fd1e0051ce83340ccfbbc8a43a462bb19cf2";
+    sha256 = "0x746wr2324l6bn7skqzgkzcbj5kd0zp2ck0c8rldrw0rzabg826";
+  };
 in buildLisp.library {
   name = "usocket";
   deps = with depot.third_party.lisp; [