Fixes for tests

Author: hamishmack

test/cabal-doctests/default.nix

@@ -20,6 +20,9 @@ let
   };
 
 in recurseIntoAttrs ({
+  # Making cabal-doctest work for cross compilers will be difficult.
+  meta.disabled = stdenv.buildPlatform != stdenv.hostPlatform || builtins.compareVersions
+    buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.0" >= 0;
   ifdInputs = {
     plan-nix = addMetaAttrs meta project.plan-nix;
   };
@@ -35,8 +38,6 @@ in recurseIntoAttrs ({
 
     meta = {
       platforms = platforms.all;
-      # Making cabal-doctest work for cross compilers will be difficult.
-      disabled = stdenv.buildPlatform != stdenv.hostPlatform;
     };
 
     passthru = {

test/default.nix

@@ -10,6 +10,9 @@
 with pkgs;
 
 let
+  inherit (import ../ci-lib.nix) dimension platformFilterGeneric filterAttrsOnlyRecursive;
+  isDisabled = d: d.meta.disabled or false;
+
   # Set recurseForDerivations for both children and grand-children values in
   # the input association list, but only if the key is "ifdInputs".
   #
@@ -241,7 +244,8 @@ let
   # - input ifdLevel is 3 or greater: return allTests
   optionalIfdTests = ifdLevel:
     pkgs.lib.optionalAttrs (ifdLevel > 1) (allTestsWithIfdInputs ifdLevel);
-in pkgs.recurseIntoAttrs (optionalIfdTests ifdLevel)
+in filterAttrsOnlyRecursive (_: v: !(isDisabled v))
+  (pkgs.recurseIntoAttrs (optionalIfdTests ifdLevel))
 
 ## more possible test cases
 # 1. fully static linking

test/haskell-language-server/cabal.nix

@@ -6,4 +6,8 @@ in recurseIntoAttrs {
     inherit (project) plan-nix;
   };
   build = project.getComponent "haskell-language-server:exe:haskell-language-server";
+
+  # Haskell Language Server does not build for GHC 9 yet
+  meta.disabled = builtins.compareVersions
+    buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.0" >= 0;
 }