Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

1 files changed, 5 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/haskell-modules/lib/default.nix b/nixpkgs/pkgs/development/haskell-modules/lib/default.nix
index ffd9ac057890..2bcd8f25d114 100644
--- a/nixpkgs/pkgs/development/haskell-modules/lib/default.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/lib/default.nix
@@ -105,6 +105,11 @@ rec {
      of test suites listed in the package description file.
    */
   dontCheck = compose.dontCheck;
+  /* The dontCheckIf variant sets doCheck = false if the condition
+     applies. In any other case the previously set/default value is used.
+     This prevents accidentally re-enabling tests in a later override.
+   */
+  dontCheckIf = drv: condition: compose.dontCheckIf condition drv;
 
   /* doBenchmark enables dependency checking, compilation and execution
      for benchmarks listed in the package description file.