From 7268605e00f4af6e02becf6f951eac2f76a49cbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 May 2015 12:40:55 +0200 Subject: [PATCH] idris: remove outdated overrides The Idris build is broken for several reasons, I'm afraid, and has been broken since a while. It' seems unnecessary to carry these non-functioning overrides around. --- .../haskell-modules/configuration-ghc-7.8.x.nix | 10 ---------- 1 file changed, 10 deletions(-) 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 660fc5d9a4e..b7430c455b1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -48,16 +48,6 @@ self: super: { # haddock-api 2.16 requires ghc>=7.10 haddock-api = super.haddock-api_2_15_0_2; - # Idris needs special version of some libraries - idris = let super1 = super; in overrideCabal (super.idris.overrideScope (self: super: { - annotated-wl-pprint = self.annotated-wl-pprint_0_5_3; - blaze-html = self.blaze-html_0_7_0_3; - blaze-markup = self.blaze-markup_0_6_2_0; - lens = self.lens_4_7_0_1; - })) (drv: { - patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +"; - }); # warning: "Module ‘Control.Monad.Error’ is deprecated" - # This is part of bytestring in our compiler. bytestring-builder = dontHaddock super.bytestring-builder;