From 8361b82d0ac59f436f7ecef283077b0f7d689ca1 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 10 Apr 2021 02:13:18 +0200 Subject: 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 --- third_party/lisp/cl-json.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'third_party/lisp/cl-json.nix') diff --git a/third_party/lisp/cl-json.nix b/third_party/lisp/cl-json.nix index 3652bd07932c..5d1450a3e9a1 100644 --- a/third_party/lisp/cl-json.nix +++ b/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") ]; -- cgit 1.4.1