From f2443911cc730cbdd927a8c8b8e0012659a464ff Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 10 Apr 2021 13:38:50 +0200 Subject: refactor(fun): 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 //fun Change-Id: I45a7b392a9749fa7859ff5100dcea415bda807c3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2914 Tested-by: BuildkiteCI Reviewed-by: sterni --- fun/gemma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fun/gemma/default.nix') diff --git a/fun/gemma/default.nix b/fun/gemma/default.nix index dbfaf5effc31..902f5857db42 100644 --- a/fun/gemma/default.nix +++ b/fun/gemma/default.nix @@ -2,7 +2,7 @@ let inherit (pkgs) cacert iana-etc libredirect stdenv runCommandNoCC writeText; - elmPackages = pkgs.elmPackages_0_18; + elmPackages = depot.third_party.elmPackages_0_18; frontend = stdenv.mkDerivation { name = "gemma-frontend.html"; @@ -36,7 +36,7 @@ let in depot.nix.buildLisp.program { name = "gemma"; - deps = with pkgs.lisp; [ + deps = with depot.third_party.lisp; [ cl-json cl-prevalence hunchentoot -- cgit 1.4.1