test: fix meta.broken detection (again)

meta.broken will haunt me forever.
hraban · Oct 16, 2023 · 7ef111f · 7ef111f
1 parent 6bc1dbd
commit 7ef111f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/examples/channels/all-packages-wrapped/default.nix b/examples/channels/all-packages-wrapped/default.nix
@@ -7,9 +7,8 @@ with pkgs.lib;
 with rec {
   lispPackagesLite = pkgs.lispPackagesLiteFor (f: "${pkgs.sbcl}/bin/sbcl --dynamic-space-size 4000 --script ${f}");
   isSafeLisp = d: let
-    ev = builtins.tryEval d;
-    d' = ev.value;
-  in ev.success && (isDerivation d') && !(d'.meta.broken or false);
+    ev = builtins.tryEval (isDerivation d && !(d.meta.broken or false));
+  in ev.success && ev.value;
 };
 
 lispPackagesLite.lispWithSystems (

diff --git a/examples/channels/all-packages/default.nix b/examples/channels/all-packages/default.nix
@@ -8,9 +8,8 @@ with rec {
   # Compiling Shinmera/3d-math requires a lot of memory, might as well grant it
   lispPackagesLite = pkgs.lispPackagesLiteFor (f: "${pkgs.sbcl}/bin/sbcl --dynamic-space-size 4000 --script ${f}");
   isSafeLisp = d: let
-    ev = builtins.tryEval d;
-    d' = ev.value;
-  in ev.success && (isDerivation d') && !(d'.meta.broken or false);
+    ev = builtins.tryEval (isDerivation d && !(d.meta.broken or false));
+  in ev.success && ev.value;
 };
 
 attrsets.filterAttrs (_: isSafeLisp) lispPackagesLite
diff --git a/examples/channels/test-all/default.nix b/examples/channels/test-all/default.nix
@@ -57,13 +57,22 @@ with rec {
   # it
   lispPackagesLite = pkgs.lispPackagesLiteFor (f: "${pkgs.sbcl}/bin/sbcl --dynamic-space-size 4000 --script ${f}");
   isSafeLisp = d: let
-    ev = builtins.tryEval d;
-    d' = ev.value;
-  in ev.success && (isDerivation d') && !(d'.meta.broken or false);
+    ev = builtins.tryEval (isDerivation d && !(d.meta.broken or false));
+  in ev.success && ev.value;
   shouldTest = name: ! builtins.elem name skip;
 };
 
 pipe lispPackagesLite [
-  (attrsets.filterAttrs (n: d: (isSafeLisp d) && (shouldTest n)))
-  (builtins.mapAttrs (k: v: v.enableCheck))
+  (builtins.mapAttrs (name: value: let
+    ev = builtins.tryEval (let
+      d = value.enableCheck;
+    in
+      if shouldTest name && isDerivation value && !(d.meta.broken or false)
+      then d
+      else null);
+    in
+      if ev.success && ev.value != null
+      then ev.value
+      else null))
+  (attrsets.filterAttrs (n: d: d != null))
 ]