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/chipz.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'third_party/lisp/chipz.nix') diff --git a/third_party/lisp/chipz.nix b/third_party/lisp/chipz.nix index dfbf32b09411..2a68d3b1f8e9 100644 --- a/third_party/lisp/chipz.nix +++ b/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" -- cgit 1.4.1