From d7224d5074c4760a905d8c3d72dd41fe1e3601c9 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Wed, 28 Jan 2026 12:08:09 +1000 Subject: [PATCH] replace Wrap usage with Terminal --- nt/CHECK_LIST.md | 3 --- nt/mix/mixture.nix | 4 ++-- nt/primitives/nt.nix | 6 +++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/nt/CHECK_LIST.md b/nt/CHECK_LIST.md index 6ac2d49..7947333 100644 --- a/nt/CHECK_LIST.md +++ b/nt/CHECK_LIST.md @@ -1,6 +1,3 @@ -- [ ] implement naive Tip/Terminal type -- [ ] remove all dependency on Wrap type (it's already gone anyways...) -- [ ] /primitives/bootstrap/parse/parse.nix should be able to terminate on Tip/Terminal elements - [ ] mix should do a deeply nested merge, not a surface level merge - [ ] implement isomorphisms (especially from primitives to NixTypes) diff --git a/nt/mix/mixture.nix b/nt/mix/mixture.nix index a7df1d1..219f60d 100644 --- a/nt/mix/mixture.nix +++ b/nt/mix/mixture.nix @@ -33,8 +33,8 @@ in { protected = []; }; # XXX: TODO: are these needed? - # options = Wrap {}; - # config = Wrap {}; + # options = Terminal {}; + # config = Terminal {}; }; descendentInputs = mkInputs mixture.protected; diff --git a/nt/primitives/nt.nix b/nt/primitives/nt.nix index 9e8701a..7f21268 100644 --- a/nt/primitives/nt.nix +++ b/nt/primitives/nt.nix @@ -31,7 +31,7 @@ inherit (this.types) - Wrap + Terminal ; recdef = def: let @@ -40,8 +40,8 @@ Self; classDecl = { - derive = Wrap []; - ops = Wrap {}; + derive = Terminal []; + ops = Terminal {}; }; unwrapBuilder = builder: Self: