From eb32c97162992eedf9d6b633c14c895b418df621 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2015 13:31:31 +0200 Subject: [PATCH] HStringTemplate: remove obsolete overrides --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 3 --- 2 files changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index ef663ba2ca8..f938222afda 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -41,8 +41,6 @@ self: super: { # Cabal_1_22_1_1 requires filepath >=1 && <1.4 cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); - HStringTemplate = self.HStringTemplate_0_8_3; - # We have Cabal 1.22.x. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; 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 361d404412e..660fc5d9a4e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -58,9 +58,6 @@ self: super: { patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +"; }); # warning: "Module ‘Control.Monad.Error’ is deprecated" - # Depends on time == 0.1.5, which we don't have. - HStringTemplate_0_8_3 = dontDistribute super.HStringTemplate_0_8_3; - # This is part of bytestring in our compiler. bytestring-builder = dontHaddock super.bytestring-builder;