alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Disable all Haskell builds for Darwin on Hydra.

Browse source 
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: <https://github.com/NixOS/nixpkgs/issues/2689>.
This commit is contained in:
Peter Simons 2014-10-21 23:30:55 +02:00
parent 917c1638bf
commit 7a20d76482
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/build-support/cabal/default.nix
View file

@ -57,6 +57,13 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
doCheck = enableCheckPhase && x.doCheck; doCheck = enableCheckPhase && x.doCheck;
hyperlinkSource = enableHyperlinkSource && x.hyperlinkSource; hyperlinkSource = enableHyperlinkSource && x.hyperlinkSource;
# Disable Darwin builds: <https://github.com/NixOS/nixpkgs/issues/2689>.
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 = defaults =

14
pkgs/development/compilers/ghc/7.8.3.nix
View file

@ -32,15 +32,15 @@ stdenv.mkDerivation rec {
# that in turn causes GHCi to abort # that in turn causes GHCi to abort
stripDebugFlags = [ "-S" "--keep-file-symbols" ]; stripDebugFlags = [ "-S" "--keep-file-symbols" ];
meta = { meta = with stdenv.lib; {
homepage = "http://haskell.org/ghc"; homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler"; description = "The Glasgow Haskell Compiler";
maintainers = [ maintainers = [ maintainers.marcweber maintainers.andres maintainers.simons ];
stdenv.lib.maintainers.marcweber inherit (ghc.meta) license;
stdenv.lib.maintainers.andres # Filter old "i686-darwin" platform which is unsupported these days.
stdenv.lib.maintainers.simons platforms = filter (x: elem x platforms.all) ghc.meta.platforms;
]; # Disable Darwin builds: <https://github.com/NixOS/nixpkgs/issues/2689>.
inherit (ghc.meta) license platforms; hydraPlatforms = filter (x: !elem x platforms.darwin) meta.platforms;
}; };
} }