From 66ecf37c37dd0ee62223c8ac306582007c433293 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 14 Oct 2023 16:48:53 +0200 Subject: [PATCH] test: Move testEqDrv to testSupport --- effects/nix-darwin/eval-test.nix | 6 +----- lib/testSupport.nix | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/effects/nix-darwin/eval-test.nix b/effects/nix-darwin/eval-test.nix index 10f9549..f24ada2 100644 --- a/effects/nix-darwin/eval-test.nix +++ b/effects/nix-darwin/eval-test.nix @@ -13,11 +13,7 @@ in rec { inherit darwin testSupport; inherit (inputs) flake-parts; - inherit (testSupport) callFlakeOutputs; - - testEqDrv = drv1: drv2: - if drv1 == drv2 then true - else builtins.trace "Oh-oh, these are different! Check the differences with\nnix-diff --color=always ${drv1} ${drv2} | less -RS" false; + inherit (testSupport) callFlakeOutputs testEqDrv; flake1 = callFlakeOutputs (inputs: flake-parts.lib.mkFlake { inherit inputs; } ({ withSystem, self, ... }: { diff --git a/lib/testSupport.nix b/lib/testSupport.nix index d8a5a69..b2b61fc 100644 --- a/lib/testSupport.nix +++ b/lib/testSupport.nix @@ -21,9 +21,14 @@ let sourceInfo = { }; }; + testEqDrv = drv1: drv2: + if drv1 == drv2 then true + else builtins.trace "Oh-oh, these are different! Check the differences with\nnix-diff --color=always ${drv1} ${drv2} | less -RS" false; + in { inherit callFlake callFlakeOutputs + testEqDrv ; } \ No newline at end of file