mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
Merge pull request #21393 from mpickering/master
Small improvements to development GHC derivations
This commit is contained in:
Peter Simons
GitHub
commit
494d695b97
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
|
||||
, autoconf, automake, happy, alex, crossSystem, selfPkgs, cross ? null
|
||||
, autoconf, automake, happy, alex, python3, crossSystem, selfPkgs, cross ? null
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (bootPkgs) ghc;
|
||||
|
||||
commonBuildInputs = [ ghc perl autoconf automake happy alex ];
|
||||
commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
|
||||
|
||||
version = "8.1.20161115";
|
||||
version = "8.1.20161224";
|
||||
|
||||
commonPreConfigure = ''
|
||||
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
||||
@ -19,27 +19,26 @@ let
|
||||
in stdenv.mkDerivation (rec {
|
||||
inherit version;
|
||||
name = "ghc-${version}";
|
||||
rev = "017d11e0a36866b05ace32ece1af11adf652a619";
|
||||
rev = "2689a1692636521777f007861a484e7064b2d696";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.haskell.org/ghc.git";
|
||||
inherit rev;
|
||||
sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y";
|
||||
sha256 = "0rk6xy7kgxx849nprq1ji459p88nyy93236g841m5p6mdh7mmrcr";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
preConfigure = ''
|
||||
echo ${version} >VERSION
|
||||
echo ${rev} >GIT_COMMIT_ID
|
||||
patchShebangs .
|
||||
./boot
|
||||
'';
|
||||
'' + commonPreConfigure ;
|
||||
|
||||
buildInputs = commonBuildInputs;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = commonPreConfigure;
|
||||
|
||||
configureFlags = [
|
||||
"CC=${stdenv.cc}/bin/cc"
|
||||
"--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
|
||||
@ -52,6 +51,8 @@ in stdenv.mkDerivation (rec {
|
||||
# that in turn causes GHCi to abort
|
||||
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
|
||||
|
||||
checkTarget = "test";
|
||||
|
||||
postInstall = ''
|
||||
paxmark m $out/lib/${name}/bin/{ghc,haddock}
|
||||
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }:
|
||||
|
||||
let
|
||||
inherit (bootPkgs) ghc;
|
||||
|
||||
buildMK = ''
|
||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
|
||||
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
|
||||
libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
|
||||
libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
|
||||
DYNAMIC_BY_DEFAULT = NO
|
||||
SRC_HC_OPTS = -H64m -O -fasm
|
||||
GhcLibHcOpts = -O -dcore-lint
|
||||
GhcStage1HcOpts = -Rghc-timing -O -fasm
|
||||
GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG
|
||||
SplitObjs = NO
|
||||
HADDOCK_DOCS = NO
|
||||
BUILD_DOCBOOK_HTML = NO
|
||||
BUILD_DOCBOOK_PS = NO
|
||||
BUILD_DOCBOOK_PDF = NO
|
||||
LAX_DEPENDENCIES = YES
|
||||
${stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
|
||||
libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
|
||||
''}
|
||||
'';
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.11.20150826";
|
||||
name = "ghc-${version}"; # We cannot add a "nokinds" tag here; see git comment for details.
|
||||
rev = "5f7f64b7fc879b5ecfd6987ec5565bd90f7c0179";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/goldfirere/ghc.git";
|
||||
inherit rev;
|
||||
sha256 = "183l4v6aw52r3ydwl8bxg1lh3cwfakb35rpy6mjg23dqmqsynmcn";
|
||||
};
|
||||
|
||||
patches = [ ./relocation.patch ];
|
||||
|
||||
postUnpack = ''
|
||||
pushd ghc-${builtins.substring 0 7 rev}
|
||||
echo ${version} >VERSION
|
||||
echo ${rev} >GIT_COMMIT_ID
|
||||
patchShebangs .
|
||||
./boot
|
||||
popd
|
||||
'';
|
||||
|
||||
buildInputs = [ ghc perl autoconf automake happy alex ];
|
||||
|
||||
preConfigure = ''
|
||||
echo >mk/build.mk "${buildMK}"
|
||||
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
||||
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-gcc=${stdenv.cc}/bin/cc"
|
||||
"--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# required, because otherwise all symbols from HSffi.o are stripped, and
|
||||
# that in turn causes GHCi to abort
|
||||
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
|
||||
|
||||
passthru = {
|
||||
inherit bootPkgs;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "http://haskell.org/ghc";
|
||||
description = "The dependently-typed 'nokinds' branch of the Glasgow Haskell Compiler by Richard Eisenberg";
|
||||
maintainers = with stdenv.lib.maintainers; [ deepfire ];
|
||||
inherit (ghc.meta) license platforms;
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,102 +0,0 @@
|
||||
{ pkgs }:
|
||||
|
||||
with import ./lib.nix { inherit pkgs; };
|
||||
|
||||
self: super: {
|
||||
|
||||
# Use the latest LLVM.
|
||||
inherit (pkgs) llvmPackages;
|
||||
|
||||
# Disable GHC 7.11.x core libraries.
|
||||
array = null;
|
||||
base = null;
|
||||
binary = null;
|
||||
bin-package-db = null;
|
||||
bytestring = null;
|
||||
Cabal = null;
|
||||
containers = null;
|
||||
deepseq = null;
|
||||
directory = null;
|
||||
filepath = null;
|
||||
ghc-prim = null;
|
||||
haskeline = null;
|
||||
hoopl = null;
|
||||
hpc = null;
|
||||
integer-gmp = null;
|
||||
pretty = null;
|
||||
process = null;
|
||||
rts = null;
|
||||
template-haskell = null;
|
||||
terminfo = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
|
||||
jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal;
|
||||
|
||||
# GHC 7.10.x's Haddock binary cannot generate hoogle files.
|
||||
# https://ghc.haskell.org/trac/ghc/ticket/9921
|
||||
mkDerivation = drv: super.mkDerivation (drv // { doHoogle = false; doHaddock = false; });
|
||||
|
||||
# haddock: No input file(s).
|
||||
nats = dontHaddock super.nats;
|
||||
bytestring-builder = dontHaddock super.bytestring-builder;
|
||||
|
||||
# We have time 1.5
|
||||
aeson = disableCabalFlag super.aeson "old-locale";
|
||||
|
||||
# Show works differently for record syntax now, breaking haskell-src-exts' parser tests
|
||||
# https://github.com/haskell-suite/haskell-src-exts/issues/224
|
||||
haskell-src-exts = dontCheck super.haskell-src-exts;
|
||||
|
||||
mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
|
||||
url = "https://github.com/snoyberg/mono-traversable/pull/77.patch";
|
||||
sha256 = "1qrvrh3cqfkymi5yb9y9z88rq4n7ag0ac2k00mcnqh4dz1vh4fg1";
|
||||
});
|
||||
yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch {
|
||||
url = "https://github.com/yesodweb/yesod/pull/1006.patch";
|
||||
sha256 = "0l6wjj8cfz6jy6j92kywsccafyffhlm5240q82bzirb278adqvar";
|
||||
stripLen = 1;
|
||||
});
|
||||
|
||||
# Setup: At least the following dependencies are missing: base <4.8
|
||||
hspec-expectations = overrideCabal super.hspec-expectations (drv: {
|
||||
postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
|
||||
});
|
||||
utf8-string = overrideCabal super.utf8-string (drv: {
|
||||
postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
|
||||
});
|
||||
|
||||
# bos/attoparsec#92
|
||||
attoparsec = dontCheck super.attoparsec;
|
||||
|
||||
# test suite hangs silently for at least 10 minutes
|
||||
split = dontCheck super.split;
|
||||
|
||||
# Test suite fails with some (seemingly harmless) error.
|
||||
# https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24
|
||||
syb = dontCheck super.syb;
|
||||
|
||||
# Test suite has stricter version bounds
|
||||
retry = dontCheck super.retry;
|
||||
|
||||
# Test suite fails with time >= 1.5
|
||||
http-date = dontCheck super.http-date;
|
||||
|
||||
# Version 1.19.5 fails its test suite.
|
||||
happy = dontCheck super.happy;
|
||||
|
||||
# Workaround for a workaround, see comment for "ghcjs" flag.
|
||||
jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
|
||||
in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
|
||||
self.webkitgtk3-javascriptcore ];
|
||||
|
||||
# The compat library is empty in the presence of mtl 2.2.x.
|
||||
mtl-compat = dontHaddock super.mtl-compat;
|
||||
|
||||
# Won't work with LLVM 3.5.
|
||||
llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
|
||||
|
||||
}
|
||||
@ -58,11 +58,6 @@ rec {
|
||||
inherit crossSystem;
|
||||
selfPkgs = packages.ghcHEAD;
|
||||
};
|
||||
ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec {
|
||||
bootPkgs = packages.ghc784;
|
||||
inherit (bootPkgs) alex happy;
|
||||
};
|
||||
|
||||
ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
|
||||
bootPkgs = packages.ghc7103;
|
||||
};
|
||||
@ -138,10 +133,6 @@ rec {
|
||||
ghc = compiler.ghcHEAD.crossCompiler;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
|
||||
};
|
||||
ghcNokinds = callPackage ../development/haskell-modules {
|
||||
ghc = compiler.ghcNokinds;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { };
|
||||
};
|
||||
ghcjs = callPackage ../development/haskell-modules {
|
||||
ghc = compiler.ghcjs;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user