9 files changed, 13 insertions, 12 deletions
diff --git a/third_party/OWNERS b/third_party/OWNERS
deleted file mode 100644
index ac22fcb4bc23..000000000000
--- a/third_party/OWNERS
+++ /dev/null
@@ -1,9 +0,0 @@
-inherited: true
-
-matchers:
-  # The nixpkgs whitelist needs to be changed every time we reference
-  # a new attribute, so every commiter should be able to change it,
-  # otherwise we create undue blockers on superowners.
-  - exact: nixpkgs-exposed.nix
-    owners:
-      - Profpatsch
diff --git a/third_party/default.nix b/third_party/default.nix
index 6d70fa072328..7638d98d6575 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -29,7 +29,7 @@ let
   };
   stableNixpkgs = import stableNixpkgsSrc {};
 
-  exposed = import ./nixpkgs-exposed.nix { inherit nixpkgs stableNixpkgs; };
+  exposed = import ./nixpkgs-exposed/exposed { inherit nixpkgs stableNixpkgs; };
 
 in exposed.lib.fix(self: exposed // {
   callPackage = nixpkgs.lib.callPackageWith self;
diff --git a/third_party/nixpkgs-exposed/.skip-subtree b/third_party/nixpkgs-exposed/.skip-subtree
new file mode 100644
index 000000000000..aff471145e46
--- /dev/null
+++ b/third_party/nixpkgs-exposed/.skip-subtree
@@ -0,0 +1 @@
+This subtree is responsible for setting up the read tree arguments in the first place.
diff --git a/third_party/nixpkgs-exposed/OWNERS b/third_party/nixpkgs-exposed/OWNERS
new file mode 100644
index 000000000000..32f9ac249938
--- /dev/null
+++ b/third_party/nixpkgs-exposed/OWNERS
@@ -0,0 +1,6 @@
+# The nixpkgs whitelist needs to be changed every time we reference
+# a new attribute, so every commiter should be able to change it,
+# otherwise we create undue blockers on superowners.
+inherited: true
+owners:
+  - Profpatsch
diff --git a/third_party/nixpkgs-exposed.nix b/third_party/nixpkgs-exposed/exposed/default.nix
index 07887ea96c48..8c666bbf59c8 100644
--- a/third_party/nixpkgs-exposed.nix
+++ b/third_party/nixpkgs-exposed/exposed/default.nix
@@ -1,3 +1,6 @@
+# This file has to be in yet another subdir
+# because of how readTree interprets .skip-subtree
+# see https://b.tvl.fyi/issues/89
 { nixpkgs, stableNixpkgs }:
 {
   # Inherit the packages from nixos-unstable that should be available inside
@@ -164,7 +167,7 @@
     ;
 
   haskellPackages = (nixpkgs.haskellPackages.override {
-    overrides = (import ./haskell_overlay { pkgs = nixpkgs; });
+    overrides = (import ../haskell_overlay { pkgs = nixpkgs; });
   });
 
   gradle_6 = (nixpkgs.gradleGen.override {
diff --git a/third_party/haskell_overlay/default.nix b/third_party/nixpkgs-exposed/haskell_overlay/default.nix
index c1d257808549..600d26541ec2 100644
--- a/third_party/haskell_overlay/default.nix
+++ b/third_party/nixpkgs-exposed/haskell_overlay/default.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import ./nixpkgs.nix {}, ... }:
+{ pkgs }:
 
 self: super: with pkgs.haskell.lib; rec {
   aeson = doJailbreak super.aeson;
diff --git a/third_party/haskell_overlay/patches/generic-arbitrary-export-garbitrary.patch b/third_party/nixpkgs-exposed/haskell_overlay/patches/generic-arbitrary-export-garbitrary.patch
index f0c936bfca18..f0c936bfca18 100644
--- a/third_party/haskell_overlay/patches/generic-arbitrary-export-garbitrary.patch
+++ b/third_party/nixpkgs-exposed/haskell_overlay/patches/generic-arbitrary-export-garbitrary.patch
diff --git a/third_party/haskell_overlay/patches/hgeometry-fix-haddock.patch b/third_party/nixpkgs-exposed/haskell_overlay/patches/hgeometry-fix-haddock.patch
index 748c65b3e0db..748c65b3e0db 100644
--- a/third_party/haskell_overlay/patches/hgeometry-fix-haddock.patch
+++ b/third_party/nixpkgs-exposed/haskell_overlay/patches/hgeometry-fix-haddock.patch
diff --git a/third_party/haskell_overlay/patches/update-comonad-extras.patch b/third_party/nixpkgs-exposed/haskell_overlay/patches/update-comonad-extras.patch
index 2a419f320297..2a419f320297 100644
--- a/third_party/haskell_overlay/patches/update-comonad-extras.patch
+++ b/third_party/nixpkgs-exposed/haskell_overlay/patches/update-comonad-extras.patch