From 7a20d764827f12bdd783a63a14ff0b2b9fcfeb96 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 21 Oct 2014 23:30:55 +0200 Subject: [PATCH] Disable all Haskell builds for Darwin on Hydra. Hydra generates a GHC closure for Darwin that for no apparent reason contains an ancient, broken Haddock binary -- probably because of an impurity in the build system. That bug makes those GHC binaries unusable: . --- pkgs/build-support/cabal/default.nix | 7 +++++++ pkgs/development/compilers/ghc/7.8.3.nix | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index a55de86cb15..2b06adf3490 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -57,6 +57,13 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; doCheck = enableCheckPhase && x.doCheck; hyperlinkSource = enableHyperlinkSource && x.hyperlinkSource; + # Disable Darwin builds: . + meta = let meta = x.meta; + hydraPlatforms = meta.hydraPlatforms or meta.platforms or []; + noElem = p: ps: !stdenv.lib.elem p ps; + noDarwin = p: noElem p stdenv.lib.platforms.darwin; + in + meta // { hydraPlatforms = filter noDarwin hydraPlatforms; }; }; defaults = diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix index dbcba36fa8f..0c142883e65 100644 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ b/pkgs/development/compilers/ghc/7.8.3.nix @@ -32,15 +32,15 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" "--keep-file-symbols" ]; - meta = { + meta = with stdenv.lib; { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - stdenv.lib.maintainers.simons - ]; - inherit (ghc.meta) license platforms; + maintainers = [ maintainers.marcweber maintainers.andres maintainers.simons ]; + inherit (ghc.meta) license; + # Filter old "i686-darwin" platform which is unsupported these days. + platforms = filter (x: elem x platforms.all) ghc.meta.platforms; + # Disable Darwin builds: . + hydraPlatforms = filter (x: !elem x platforms.darwin) meta.platforms; }; }