From c64088f0ec112d60b4f5c1cef7bc55b154465583 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 20 Jan 2015 23:23:59 +0100 Subject: [PATCH] haskell-streaming-commons: fix build on older GHC versions by way of bytestring-builder --- .../development/haskell-modules/configuration-ghc-7.4.x.nix | 6 ++++++ .../development/haskell-modules/configuration-ghc-7.6.x.nix | 6 ++++++ .../development/haskell-modules/configuration-ghc-7.8.x.nix | 3 +++ 3 files changed, 15 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 46661b56d6b..d928943fed3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -57,4 +57,10 @@ self: super: { # The test suite depends on time >=1.4.0.2. cookie = dontCheck super.cookie ; + # bytestring >=0.10.2.0 + streaming-commons = addBuildTool super.streaming-commons self.bytestring-builder; + + # Choose appropriate flags for our version of 'bytestring'. + bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder"; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index c7de3ddaa78..a0ee12f334d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -57,4 +57,10 @@ self: super: { # The test suite depends on time >=1.4.0.2. cookie = dontCheck super.cookie ; + # bytestring >=0.10.2.0 + streaming-commons = addBuildTool super.streaming-commons self.bytestring-builder; + + # Choose appropriate flags for our version of 'bytestring'. + bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder"; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 0ced8929c8f..0b6c3995cb8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -52,6 +52,9 @@ self: super: { # Depends on time == 0.1.5, which we don't have. HStringTemplate_0_8 = dontDistribute super.HStringTemplate_0_8; + # This is part of bytestring in our compiler. + bytestring-builder = dontHaddock super.bytestring-builder; + } // # packages relating to amazonka