Skip to content

Commit

Permalink
ghc: add release candidate 1 for 8.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
peti committed Nov 26, 2016
1 parent be34ee4 commit c272c66
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 0 deletions.
84 changes: 84 additions & 0 deletions pkgs/development/compilers/ghc/8.0.2.nix
@@ -0,0 +1,84 @@
{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
, hscolour, patchutils
}:

let
inherit (bootPkgs) ghc;

fetchFilteredPatch = args: fetchurl (args // {
downloadToTemp = true;
postFetch = ''
${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out"
'';
});
in
stdenv.mkDerivation rec {
version = "8.0.1.20161117";

This comment has been minimized.

Copy link
@domenkozar

domenkozar Nov 30, 2016

Member

Shouldn't this be 8.0.2?

This comment has been minimized.

Copy link
@peti

peti Nov 30, 2016

Author Member

No, it's not released as 8.0.2 yet; it's only a release candidate.

This comment has been minimized.

Copy link
@domenkozar

domenkozar Nov 30, 2016

Member

Ah I remember, the strange GHC versioning scheme.

This comment has been minimized.

Copy link
@vcunat

vcunat Nov 30, 2016

Member

Well, it preserves ordering nicely :-) (-rc2 suffix would not)

name = "ghc-${version}";

src = fetchurl {
url = "https://downloads.haskell.org/~ghc/8.0.2-rc1/${name}-src.tar.xz";
sha256 = "08hpzvg059ha0knmlngd0winfkplkkb7dk88zfz3s177z38kd874";
};

patches = [
./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752

This comment has been minimized.

Copy link
@dezgeg

dezgeg Nov 30, 2016

Contributor

@peti You forgot to commit this file.

This comment has been minimized.

Copy link
@peti

peti via email Nov 30, 2016

Author Member

This comment has been minimized.

This comment has been minimized.

Copy link
@peti

peti Nov 30, 2016

Author Member

Ah, okay. That file has been removed in the recent merge of staging. 2605149 fixes this. Thanks for the heads-up.

This comment has been minimized.

Copy link
@peti

peti Nov 30, 2016

Author Member

I meant commit fb9f992, of course.


# Already applied?
# ./relocation.patch
# Fix https://ghc.haskell.org/trac/ghc/ticket/12130
# (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; })
(fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })
] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;

buildInputs = [ ghc perl hscolour ];

enableParallelBuilding = true;

outputs = [ "out" "doc" ];

preConfigure = ''
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"
"--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
"--datadir=$doc/share/doc/ghc"
] ++ stdenv.lib.optional stdenv.isDarwin [
"--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/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 [ binutils 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;
};

}
8 changes: 8 additions & 0 deletions pkgs/top-level/haskell-packages.nix
Expand Up @@ -46,6 +46,10 @@ rec {
bootPkgs = packages.ghc7103;
inherit (bootPkgs) hscolour;
};
ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec {
bootPkgs = packages.ghc7103;
inherit (bootPkgs) hscolour;
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
bootPkgs = packages.ghc7103;
inherit (bootPkgs) alex happy;
Expand Down Expand Up @@ -119,6 +123,10 @@ rec {
ghc = compiler.ghc801;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
};
ghc802 = callPackage ../development/haskell-modules {
ghc = compiler.ghc802;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
};
ghcHEAD = callPackage ../development/haskell-modules {
ghc = compiler.ghcHEAD;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
Expand Down

0 comments on commit c272c66

Please sign in to comment.