haskell: drop obsolete GHC version 7.10.2; we have 7.10.3
This commit is contained in:
parent
f1c236a987
commit
e98e7fb329
@ -1,88 +0,0 @@
|
|||||||
{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils
|
|
||||||
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
|
|
||||||
|
|
||||||
# If enabled GHC will be build with the GPL-free but slower integer-simple
|
|
||||||
# library instead of the faster but GPLed integer-gmp library.
|
|
||||||
, enableIntegerSimple ? false, gmp
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (bootPkgs) ghc;
|
|
||||||
|
|
||||||
buildMK = ''
|
|
||||||
libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
|
|
||||||
libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
|
|
||||||
${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"
|
|
||||||
''}
|
|
||||||
'' + (if enableIntegerSimple then ''
|
|
||||||
INTEGER_LIBRARY=integer-simple
|
|
||||||
'' else ''
|
|
||||||
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"
|
|
||||||
'');
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
version = "7.10.2";
|
|
||||||
name = "ghc-${version}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://downloads.haskell.org/~ghc/7.10.2/${name}-src.tar.xz";
|
|
||||||
sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
|
|
||||||
|
|
||||||
patches = [ ./relocation.patch ];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
outputs = [ "out" "doc" ];
|
|
||||||
|
|
||||||
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}"
|
|
||||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
|
||||||
export NIX_LDFLAGS+=" -no_dtrace_dof"
|
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
"--with-gcc=${stdenv.cc}/bin/cc"
|
|
||||||
"--datadir=$doc/share/doc/ghc"
|
|
||||||
] ++ stdenv.lib.optional (! enableIntegerSimple) [
|
|
||||||
"--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
|
|
||||||
];
|
|
||||||
|
|
||||||
# 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";
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
# Install the bash completion file.
|
|
||||||
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc
|
|
||||||
|
|
||||||
# Patch scripts to include "readelf" and "cat" in $PATH.
|
|
||||||
for i in "$out/bin/"*; do
|
|
||||||
test ! -h $i || continue
|
|
||||||
egrep --quiet '^#!' <(head -n 1 $i) || continue
|
|
||||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru = {
|
|
||||||
inherit bootPkgs;
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = http://haskell.org/ghc;
|
|
||||||
description = "The Glasgow Haskell Compiler";
|
|
||||||
maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
|
|
||||||
inherit (ghc.meta) license platforms;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
@ -58,10 +58,6 @@ in rec {
|
|||||||
ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix {
|
ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix {
|
||||||
ghc = compiler.ghc742Binary;
|
ghc = compiler.ghc742Binary;
|
||||||
};
|
};
|
||||||
ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix rec {
|
|
||||||
bootPkgs = packages.ghc784;
|
|
||||||
inherit (bootPkgs) hscolour;
|
|
||||||
};
|
|
||||||
ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix rec {
|
ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix rec {
|
||||||
bootPkgs = packages.ghc784;
|
bootPkgs = packages.ghc784;
|
||||||
inherit (bootPkgs) hscolour;
|
inherit (bootPkgs) hscolour;
|
||||||
@ -150,10 +146,6 @@ in rec {
|
|||||||
ghc = compiler.ghc784;
|
ghc = compiler.ghc784;
|
||||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
|
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
|
||||||
};
|
};
|
||||||
ghc7102 = callPackage ../development/haskell-modules {
|
|
||||||
ghc = compiler.ghc7102;
|
|
||||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
|
|
||||||
};
|
|
||||||
ghc7103 = callPackage ../development/haskell-modules {
|
ghc7103 = callPackage ../development/haskell-modules {
|
||||||
ghc = compiler.ghc7103;
|
ghc = compiler.ghc7103;
|
||||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
|
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user