fix broken tests

flake.nix

@@ -45,7 +45,7 @@
       inherit systems nixpkgs nix-unit;
     };
 
-    bootstrap = import ./nt/primitives/bootstrap;
+    bootstrap = import ./nt/primitives/std;
     mix = import ./nt/mix/bootstrap.nix {this = bootstrap;};
   in
     newMixture inputs (mixture: {

tests/default.nix

@@ -1,14 +1,18 @@
 let
-  bootstrap = import ../nt/primitives/bootstrap;
+  bootstrap = import ../nt/primitives/std;
+
+  mix = import ../nt/mix/bootstrap.nix {
+    this = bootstrap;
+  };
 
   nt = import ../nt {
-    mix = import ../nt/mix {
-      this = bootstrap;
-    };
+    inherit mix;
     # flake.nix passes `flake = inputs.self`
     flake = builtins.getFlake ../.;
   };
 
+  primitives = import ../nt/primitives {inherit mix;};
+
   dummyTest = {
     expr = 1;
     expected = 1;
@@ -17,7 +21,7 @@ in {
   testPass = dummyTest;
 
   testMaybe = let
-    maybe-mod = import ./maybe.nix {this = bootstrap;};
+    maybe-mod = import ./maybe.nix {this = primitives;};
 
     inherit
       (maybe-mod)

tests/maybe.nix

@@ -3,10 +3,6 @@
     (this)
     ntTrapdoorKey
     ntDynamicTrapdoorKey
-    ;
-
-  inherit
-    (this.std)
     enfImpls
     ;