From 80d501d553b4aa5c7f687c69cb473ea2ac299354 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sat, 5 Jun 2021 03:05:01 +0200 Subject: fix(grfn/xanthous): Update shell for new depot structure Since 473604f5675c455a65b91e287b125a9e042ae39f (CL/2910), depot hasn't been directly exposing `pkgs` as an attribute, instead exposing it via third_party.nixpkgs - the xanthous shell.nix isn't checked in CI, so it was missed as part of that refactor - this updates it to be in line with that Change-Id: I12b081c16d53c6798f51ec6660ffa6d345870580 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3176 Tested-by: BuildkiteCI Reviewed-by: grfn --- users/grfn/xanthous/shell.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/users/grfn/xanthous/shell.nix b/users/grfn/xanthous/shell.nix index 29a4952106..2695ff8d28 100644 --- a/users/grfn/xanthous/shell.nix +++ b/users/grfn/xanthous/shell.nix @@ -1,7 +1,11 @@ -{ pkgs ? (import ../../../. {}).third_party, ... }: +let + depot = import ../../../. {}; + inherit (depot) third_party; + pkgs = third_party.nixpkgs; +in (pkgs.haskellPackages.extend (pkgs.haskell.lib.packageSourceOverrides { - xanthous = pkgs.gitignoreSource ./.; + xanthous = third_party.gitignoreSource ./.; })).shellFor { packages = p: [p.xanthous]; withHoogle = true; -- cgit 1.4.1