From a2be05faa4043c225581090846c52718812fac8f Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Tue, 23 Nov 2021 14:39:20 +0300
Subject: refactor(readTree): Move copy of 'fix' into readTree

This is often used when bootstrapping a repository with readTree,
before lib is available. Having this definition in readTree is more
convenient than copy&pasting it around to callsites.

Change-Id: I6d5d27ed142bea704843fe289ad2674be8c4d360
---
 default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index 245e76e304..991010c5ff 100644
--- a/default.nix
+++ b/default.nix
@@ -10,10 +10,6 @@ let
     filter
     ;
 
-  # This definition of fix is identical to <nixpkgs>.lib.fix, but the global
-  # package set is not available here.
-  fix = f: let x = f x; in x;
-
   readTree = import ./nix/readTree {};
 
   # Disallow access to //users from other depot parts.
@@ -97,7 +93,7 @@ let
            (node.meta.targets or []))
     else [];
 
-in fix(self: (readDepot {
+in readTree.fix(self: (readDepot {
   depot = self;
 
   # Pass third_party as 'pkgs' (for compatibility with external
-- 
cgit 1.4.1