From 6644bca846a8b67fe2ba4c3a9de51009e84c37fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 31 Mar 2015 13:53:36 +0200
Subject: [PATCH] idris: fix build by providing appropriate versions of the
 build inputs

Resolves https://github.com/NixOS/nixpkgs/issues/7014.
---
 .../configuration-ghc-7.8.x.nix               |  8 +-
 .../haskell-modules/hackage-packages.nix      | 75 +++++++++++++++++++
 2 files changed, 80 insertions(+), 3 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 e53ea6fc4c8..5ca00b278fa 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -46,12 +46,14 @@ self: super: {
   # Idris requires mtl 2.2.x.
   idris = overrideCabal (super.idris.overrideScope (self: super: {
     mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; });
+    blaze-markup = self.blaze-markup_0_6_2_0;
+    blaze-html = self.blaze-html_0_7_0_3;
+    haskeline = self.haskeline_0_7_2_1;
+    lens = self.lens_4_7;
+    mtl = super.mtl_2_2_1;
     transformers = super.transformers_0_4_3_0;
     transformers-compat = disableCabalFlag super.transformers-compat "three";
-    haskeline = self.haskeline_0_7_2_1;
-    mtl = super.mtl_2_2_1;
   })) (drv: {
-    jailbreak = true;           # idris is scared of lens 4.7
     patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +";
   });                           # warning: "Module ‘Control.Monad.Error’ is deprecated"
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 72e37fe18cf..83bd636fc7d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -24976,6 +24976,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "blaze-html_0_7_0_3" = callPackage
+    ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
+     , containers, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "blaze-html";
+       version = "0.7.0.3";
+       sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx";
+       buildDepends = [ base blaze-builder blaze-markup bytestring text ];
+       testDepends = [
+         base blaze-builder blaze-markup bytestring containers HUnit
+         QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 text
+       ];
+       homepage = "http://jaspervdj.be/blaze";
+       description = "A blazingly fast HTML combinator library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "blaze-html" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
      , containers, HUnit, QuickCheck, test-framework
@@ -25064,6 +25084,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "blaze-markup_0_6_2_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "blaze-markup";
+       version = "0.6.2.0";
+       sha256 = "034aqkvxw0g6ry4d82bkvxky7w6yx4q6bp1wn4ydj9rqw8yh6m08";
+       buildDepends = [ base blaze-builder bytestring text ];
+       testDepends = [
+         base blaze-builder bytestring containers HUnit QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+       ];
+       homepage = "http://jaspervdj.be/blaze";
+       description = "A blazingly fast markup combinator library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "blaze-markup" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
      , QuickCheck, test-framework, test-framework-hunit
@@ -76644,6 +76683,42 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lens_4_7" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, comonad
+     , containers, contravariant, deepseq, directory, distributive
+     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
+     , hashable, hlint, HUnit, mtl, nats, parallel, primitive
+     , profunctors, QuickCheck, reflection, semigroupoids, semigroups
+     , simple-reflect, split, tagged, template-haskell, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th, text, transformers, transformers-compat
+     , unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "lens";
+       version = "4.7";
+       revision = "2";
+       sha256 = "1z2ydc90m0cq76yamdaws4677lpi476f9z25xrz8r7y5kxh2aq4s";
+       editedCabalFile = "1904ef544ff972225b7d36db9d386047814905a063b7d9559baf3f8ace3d7725";
+       buildDepends = [
+         array base bifunctors bytestring comonad containers contravariant
+         distributive exceptions filepath free ghc-prim hashable mtl
+         parallel primitive profunctors reflection semigroupoids semigroups
+         split tagged template-haskell text transformers transformers-compat
+         unordered-containers vector void
+       ];
+       testDepends = [
+         base bytestring containers deepseq directory doctest filepath
+         generic-deriving hlint HUnit mtl nats parallel QuickCheck
+         semigroups simple-reflect split test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th text transformers
+         unordered-containers vector
+       ];
+       homepage = "http://github.com/ekmett/lens/";
+       description = "Lenses, Folds and Traversals";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lens" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, comonad
      , containers, contravariant, deepseq, directory, distributive