diff --git a/nt/primitives/std/README.md b/nt/primitives/bootstrap/README.md similarity index 100% rename from nt/primitives/std/README.md rename to nt/primitives/bootstrap/README.md diff --git a/nt/primitives/std/attrs.nix b/nt/primitives/bootstrap/attrs.nix similarity index 100% rename from nt/primitives/std/attrs.nix rename to nt/primitives/bootstrap/attrs.nix diff --git a/nt/primitives/std/default.nix b/nt/primitives/bootstrap/default.nix similarity index 100% rename from nt/primitives/std/default.nix rename to nt/primitives/bootstrap/default.nix diff --git a/nt/primitives/std/naive/bootstrap.nix b/nt/primitives/bootstrap/naive/bootstrap.nix similarity index 100% rename from nt/primitives/std/naive/bootstrap.nix rename to nt/primitives/bootstrap/naive/bootstrap.nix diff --git a/nt/primitives/std/naive/maybe.nix b/nt/primitives/bootstrap/naive/maybe.nix similarity index 100% rename from nt/primitives/std/naive/maybe.nix rename to nt/primitives/bootstrap/naive/maybe.nix diff --git a/nt/primitives/std/naive/terminal.nix b/nt/primitives/bootstrap/naive/terminal.nix similarity index 100% rename from nt/primitives/std/naive/terminal.nix rename to nt/primitives/bootstrap/naive/terminal.nix diff --git a/nt/primitives/std/prim/README.md b/nt/primitives/bootstrap/prim/README.md similarity index 100% rename from nt/primitives/std/prim/README.md rename to nt/primitives/bootstrap/prim/README.md diff --git a/nt/primitives/std/prim/any.nix b/nt/primitives/bootstrap/prim/any.nix similarity index 100% rename from nt/primitives/std/prim/any.nix rename to nt/primitives/bootstrap/prim/any.nix diff --git a/nt/primitives/std/prim/attrs.nix b/nt/primitives/bootstrap/prim/attrs.nix similarity index 100% rename from nt/primitives/std/prim/attrs.nix rename to nt/primitives/bootstrap/prim/attrs.nix diff --git a/nt/primitives/std/prim/bootstrap.nix b/nt/primitives/bootstrap/prim/bootstrap.nix similarity index 100% rename from nt/primitives/std/prim/bootstrap.nix rename to nt/primitives/bootstrap/prim/bootstrap.nix diff --git a/nt/primitives/std/prim/fn.nix b/nt/primitives/bootstrap/prim/fn.nix similarity index 100% rename from nt/primitives/std/prim/fn.nix rename to nt/primitives/bootstrap/prim/fn.nix diff --git a/nt/primitives/std/prim/list.nix b/nt/primitives/bootstrap/prim/list.nix similarity index 100% rename from nt/primitives/std/prim/list.nix rename to nt/primitives/bootstrap/prim/list.nix diff --git a/nt/primitives/std/prim/num.nix b/nt/primitives/bootstrap/prim/num.nix similarity index 100% rename from nt/primitives/std/prim/num.nix rename to nt/primitives/bootstrap/prim/num.nix diff --git a/nt/primitives/std/prim/string.nix b/nt/primitives/bootstrap/prim/string.nix similarity index 100% rename from nt/primitives/std/prim/string.nix rename to nt/primitives/bootstrap/prim/string.nix diff --git a/nt/primitives/default.nix b/nt/primitives/default.nix index afc8965..66b0cc2 100644 --- a/nt/primitives/default.nix +++ b/nt/primitives/default.nix @@ -1,10 +1,13 @@ {mix, ...} @ inputs: mix.newMixture inputs (mixture: { isolated = true; - includes.public = [ - ./nt - ]; - submods.protected = [ - ./std - ]; + includes = { + public = [ + ./nt + ]; + protected = [ + # XXX: WARNING: reimplement std but typesafe + ./bootstrap + ]; + }; }) diff --git a/nt/primitives/nt/class.nix b/nt/primitives/nt/class.nix index 154e2f4..7a9190b 100644 --- a/nt/primitives/nt/class.nix +++ b/nt/primitives/nt/class.nix @@ -22,7 +22,7 @@ ; inherit - (this.std) + (this.prim) flip hasAttrAt projectOnto @@ -31,7 +31,7 @@ ; inherit - (this.std.terminal) + (this.naive.terminal) Terminal ; diff --git a/nt/primitives/nt/nt.nix b/nt/primitives/nt/nt.nix index d6483c8..9a8fadb 100644 --- a/nt/primitives/nt/nt.nix +++ b/nt/primitives/nt/nt.nix @@ -18,13 +18,13 @@ ; inherit - (this.std) + (this.prim) contains not ; inherit - (this.std.maybe) + (this.naive.maybe) isSome bindMaybe ; diff --git a/nt/primitives/nt/sig.nix b/nt/primitives/nt/sig.nix index e2e4ace..0ecf164 100644 --- a/nt/primitives/nt/sig.nix +++ b/nt/primitives/nt/sig.nix @@ -15,7 +15,7 @@ ; inherit - (this.std) + (this.prim) filterEven init last @@ -25,7 +25,7 @@ ; inherit - (this.std.maybe) + (this.naive.maybe) bindMaybe isSome ; diff --git a/nt/primitives/nt/trapdoor.nix b/nt/primitives/nt/trapdoor.nix index 1c2eca9..0afcd3c 100644 --- a/nt/primitives/nt/trapdoor.nix +++ b/nt/primitives/nt/trapdoor.nix @@ -6,13 +6,13 @@ ; inherit - (this.std) + (this.prim) enfAllAttrs enfHasAttr ; inherit - (this.std.maybe) + (this.naive.maybe) nullableToMaybe ;