From 0ebf24920c2ccd430b6b9226692c673e5f7cd1e9 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Wed, 28 Jan 2026 13:52:09 +1000 Subject: [PATCH] fix weird infinite recursion am i missing something? --- nt/primitives/std/default.nix | 2 +- nt/primitives/std/naive/bootstrap.nix | 4 ++-- nt/primitives/std/prim/bootstrap.nix | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nt/primitives/std/default.nix b/nt/primitives/std/default.nix index db5b681..c044d28 100644 --- a/nt/primitives/std/default.nix +++ b/nt/primitives/std/default.nix @@ -39,7 +39,7 @@ let naive = ./naive/bootstrap.nix; }; in - bootstrap {} [ + bootstrap {inherit bootstrap;} [ submods.prim submods.naive ./attrs.nix diff --git a/nt/primitives/std/naive/bootstrap.nix b/nt/primitives/std/naive/bootstrap.nix index 7b5f475..7abafa9 100644 --- a/nt/primitives/std/naive/bootstrap.nix +++ b/nt/primitives/std/naive/bootstrap.nix @@ -1,7 +1,7 @@ # WARNING: /nt/primitives/bootstrap cannot depend on mix # WARNING: this file is strictly for bootstrapping nt -{this, ...} @ inputs: -this.bootstrap inputs [ +{bootstrap, ...} @ inputs: +bootstrap inputs [ { maybe = ./maybe.nix; terminal = ./terminal.nix; diff --git a/nt/primitives/std/prim/bootstrap.nix b/nt/primitives/std/prim/bootstrap.nix index b3ece14..af54b3b 100644 --- a/nt/primitives/std/prim/bootstrap.nix +++ b/nt/primitives/std/prim/bootstrap.nix @@ -1,9 +1,10 @@ # WARNING: /nt/primitives/bootstrap cannot depend on mix # WARNING: this file is strictly for bootstrapping nt -{this, ...}: +{bootstrap, ...}: # WARNING: do not propagate `this` from parent, bootstrap/std must # WARNING: remain entirely independent from bootstrap/ -this.bootstrap {} [ +bootstrap {} [ + ./any.nix ./attrs.nix ./fn.nix ./list.nix