public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ghc: build version >8.4 with hscolour to enable source links

Browse Source 
Fixes https://github.com/NixOS/nixpkgs/issues/41179.
This commit is contained in:
Peter Simons 2018-05-28 16:32:05 +02:00
parent b825481578
commit e168ae6a9d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/ghc/8.4.2.nix
View File

@ -2,7 +2,7 @@
, buildPlatform, hostPlatform, targetPlatform , buildPlatform, hostPlatform, targetPlatform
# build-tools # build-tools
, bootPkgs, alex, happy , bootPkgs, alex, happy, hscolour
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
, libffi, libiconv ? null, ncurses , libffi, libiconv ? null, ncurses
@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 perl autoconf automake m4 python3
ghc alex happy ghc alex happy hscolour
]; ];
# For building runtime libs # For building runtime libs

4
pkgs/development/compilers/ghc/head.nix
View File

@ -2,7 +2,7 @@
, buildPlatform, hostPlatform, targetPlatform , buildPlatform, hostPlatform, targetPlatform
# build-tools # build-tools
, bootPkgs, alex, happy , bootPkgs, alex, happy, hscolour
, autoconf, automake, coreutils, fetchgit, perl, python3, m4 , autoconf, automake, coreutils, fetchgit, perl, python3, m4
, libffi, libiconv ? null, ncurses , libffi, libiconv ? null, ncurses
@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
perl autoconf automake m4 python3 perl autoconf automake m4 python3
ghc alex happy ghc alex happy hscolour
]; ];
# For building runtime libs # For building runtime libs

4
pkgs/top-level/haskell-packages.nix
View File

@ -69,13 +69,13 @@ in rec {
}; };
ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec { ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec {
bootPkgs = packages.ghc821Binary; bootPkgs = packages.ghc821Binary;
inherit (bootPkgs) alex happy; inherit (bootPkgs) alex happy hscolour;
buildLlvmPackages = buildPackages.llvmPackages_5; buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5;
}; };
ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
bootPkgs = packages.ghc821Binary; bootPkgs = packages.ghc821Binary;
inherit (bootPkgs) alex happy; inherit (bootPkgs) alex happy hscolour;
buildLlvmPackages = buildPackages.llvmPackages_5; buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5;
}; };