From e168ae6a9d8622da40f7c463097c2032edfa3f1a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 May 2018 16:32:05 +0200 Subject: [PATCH] ghc: build version >8.4 with hscolour to enable source links Fixes https://github.com/NixOS/nixpkgs/issues/41179. --- pkgs/development/compilers/ghc/8.4.2.nix | 4 ++-- pkgs/development/compilers/ghc/head.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix index a2c1a751bc35..9a57161d3a71 100644 --- a/pkgs/development/compilers/ghc/8.4.2.nix +++ b/pkgs/development/compilers/ghc/8.4.2.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform, targetPlatform # build-tools -, bootPkgs, alex, happy +, bootPkgs, alex, happy, hscolour , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 , libffi, libiconv ? null, ncurses @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl autoconf automake m4 python3 - ghc alex happy + ghc alex happy hscolour ]; # For building runtime libs diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 0d9412761b33..4bc8fb671a2d 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform, targetPlatform # build-tools -, bootPkgs, alex, happy +, bootPkgs, alex, happy, hscolour , autoconf, automake, coreutils, fetchgit, perl, python3, m4 , libffi, libiconv ? null, ncurses @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl autoconf automake m4 python3 - ghc alex happy + ghc alex happy hscolour ]; # For building runtime libs diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fab88ab180b5..e95b5046355b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -69,13 +69,13 @@ in rec { }; ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec { bootPkgs = packages.ghc821Binary; - inherit (bootPkgs) alex happy; + inherit (bootPkgs) alex happy hscolour; buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc821Binary; - inherit (bootPkgs) alex happy; + inherit (bootPkgs) alex happy hscolour; buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; };