From 7503f25359eedabc96ddcf42a419e0e2d2c371eb Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Jun 2022 19:10:29 +0200 Subject: [PATCH] haskell.lib: make doDistribute respect badPlatforms release-lib.nix's packagePlatforms will (understandably) take hydraPlatforms at face value, so we need to make sure that we don't slip anything actually unsupported in there. --- pkgs/development/haskell-modules/lib/compose.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index a831a83a15f5..600bf80cb19c 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -123,7 +123,8 @@ rec { */ doDistribute = overrideCabal (drv: { # lib.platforms.all is the default value for platforms (since GHC can cross-compile) - hydraPlatforms = drv.platforms or lib.platforms.all; + hydraPlatforms = lib.subtractLists (drv.badPlatforms or []) + (drv.platforms or lib.platforms.all); }); /* dontDistribute disables the distribution of binaries for the package via hydra.