From cfd91c70add93070869d61bf5cc0eed08871e296 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Wed, 28 Jan 2026 13:52:54 +1000 Subject: [PATCH] fix broken tests --- flake.nix | 2 +- tests/default.nix | 14 +++++++++----- tests/maybe.nix | 4 ---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 1d14516..c801833 100644 --- a/flake.nix +++ b/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: { diff --git a/tests/default.nix b/tests/default.nix index b05db11..2d2f76a 100644 --- a/tests/default.nix +++ b/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) diff --git a/tests/maybe.nix b/tests/maybe.nix index d67c96a..3572e47 100644 --- a/tests/maybe.nix +++ b/tests/maybe.nix @@ -3,10 +3,6 @@ (this) ntTrapdoorKey ntDynamicTrapdoorKey - ; - - inherit - (this.std) enfImpls ;