about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2021-06-05T01·05+0200
committergrfn <grfn@gws.fyi>2021-06-12T15·54+0000
commit80d501d553b4aa5c7f687c69cb473ea2ac299354 (patch)
treeaf08cb873bec92b466bb4993a463c078d0b0b04a
parent702594ca64c6d9d7c29ee581a3ba1e1458746033 (diff)
fix(grfn/xanthous): Update shell for new depot structure r/2652
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 <grfn@gws.fyi>
-rw-r--r--users/grfn/xanthous/shell.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/users/grfn/xanthous/shell.nix b/users/grfn/xanthous/shell.nix
index 29a4952106a1..2695ff8d28cd 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;