test: Move testEqDrv to testSupport

hercules-ci · Oct 14, 2023 · 66ecf37 · 66ecf37
1 parent 83c0f5d
commit 66ecf37
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
     ;
 }