about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-01-18T16·28+0300
committertazjin <tazjin@tvl.su>2022-01-19T10·24+0000
commit14d1ba8311b7f018aea838745935e01a700e7866 (patch)
tree8f02f53db4d4ea70305448deb800fa9cca554bb4
parent34f1074d341a024af0f09980c043130cb8d145a2 (diff)
chore(3p/nixpkgs): Make externally importable r/3631
This change is required for using our package set in exported josh
workspaces. It has no functional impact on depot itself.

Change-Id: Id48b40f067b5d53a2b7386a0ba1146a72268b923
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4990
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
-rw-r--r--third_party/nixpkgs/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 11833077628a..27a5a8673e1a 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -6,7 +6,7 @@
 # in //default.nix passes this attribute as the `pkgs` argument to all
 # readTree derivations.
 
-{ depot, externalArgs, ... }:
+{ depot ? {}, externalArgs ? {}, depotOverlays ? true, ... }:
 
 let
   # This provides the sources of nixpkgs. We track both
@@ -66,12 +66,14 @@ in import nixpkgsSrc {
       allowUnfree = true;
       allowBroken = true;
     };
+
   overlays = [
     commitsOverlay
     stableOverlay
+  ] ++ (if depotOverlays then [
     depot.third_party.overlays.haskell
     depot.third_party.overlays.emacs
     depot.third_party.overlays.tvl
     depot.third_party.overlays.ecl-static
-  ];
+  ] else []);
 }