From aaaadbbcdc8234a5cdafa9591b823acddb3897da Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 23 Mar 2021 23:46:00 +0200 Subject: chore: Remove //overrides from depot This mechanism wasn't actually used for anything other than a minor external compatibility thing for buildGo.nix, which can also be solved with a function parameter. This breaks //fun/gemma because it means that the elmPackages used to build it are no longer reachable from depot. We'll sort this out later. Change-Id: I1bf2240435e869cdc4e99bdd1a138fdd2e76f96e Reviewed-on: https://cl.tvl.fyi/c/depot/+/2646 Tested-by: BuildkiteCI Reviewed-by: sterni --- default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index b95e73ff3a..dd0af9c9bf 100644 --- a/default.nix +++ b/default.nix @@ -71,6 +71,7 @@ let (node.meta.targets or [])) else []; in fix(self: { + __readTree = []; config = config self; # Elevate 'lib' from nixpkgs @@ -100,10 +101,4 @@ in fix(self: { # Add local packages as structured by readTree // (localPkgs (readTree' self.config)) - -# Load overrides into the top-level. -# -# This can be used to move things from third_party into the top-level, too (such -# as `lib`). -// (readTree' { depot = self; pkgs = self.third_party; }) ./overrides ) -- cgit 1.4.1