From 2cf7bc982b3acdac22be108b8d1917dc652aee0b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 2 Feb 2014 20:40:29 -0500
Subject: [PATCH] idris requires llvm-general-3.3 currently

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../haskell/llvm-general-pure/3.3.nix         | 20 ++++++++++++++++
 .../libraries/haskell/llvm-general/3.3.nix    | 24 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           | 10 ++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix
 create mode 100644 pkgs/development/libraries/haskell/llvm-general/3.3.nix

diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix
new file mode 100644
index 000000000000..0a8f455d9713
--- /dev/null
+++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.nix
@@ -0,0 +1,20 @@
+{ cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "llvm-general-pure";
+  version = "3.3.8.2";
+  sha256 = "171mp9rydw6r2khcmvkcfjk934ckfahwyx1b4a15gmj8sr1s9hzp";
+  buildDepends = [ mtl parsec setenv transformers ];
+  testDepends = [
+    HUnit mtl QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  doCheck = false;
+  meta = {
+    description = "Pure Haskell LLVM functionality (no FFI)";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.nix
new file mode 100644
index 000000000000..2eb0a2c5d206
--- /dev/null
+++ b/pkgs/development/libraries/haskell/llvm-general/3.3.nix
@@ -0,0 +1,24 @@
+{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec
+, QuickCheck, setenv, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, transformers, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "llvm-general";
+  version = "3.3.8.2";
+  sha256 = "11qnvpnx4i8mjdgn5y58rl70wf8pzmd555hrdaki1f4q0035cmm5";
+  buildDepends = [
+    llvmGeneralPure mtl parsec setenv transformers utf8String
+  ];
+  testDepends = [
+    HUnit llvmGeneralPure mtl QuickCheck testFramework
+    testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  buildTools = [ llvmConfig ];
+  doCheck = false;
+  meta = {
+    description = "General purpose LLVM bindings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a24761394558..783b868f804d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1566,11 +1566,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ListZipper = callPackage ../development/libraries/haskell/ListZipper {};
 
+  # Needed for idris for now
+  llvmGeneral_3_3 = callPackage ../development/libraries/haskell/llvm-general/3.3.nix {
+    llvmConfig = pkgs.llvm_33;
+    llvmGeneralPure = self.llvmGeneralPure_3_3;
+  };
+
   llvmGeneral = callPackage ../development/libraries/haskell/llvm-general {
     llvmConfig = pkgs.llvm;
     inherit (pkgs) zlib ncurses;
   };
 
+  llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { };
+
   llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {};
 
   lrucache = callPackage ../development/libraries/haskell/lrucache {};
@@ -2713,6 +2721,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   idris_plain = callPackage ../development/compilers/idris {
     parsers = self.parsers_0_9;
     trifecta = self.trifecta_1_1;
+    llvmGeneral = self.llvmGeneral_3_3;
+    llvmGeneralPure = self.llvmGeneralPure_3_3;
   };
 
   idris = callPackage ../development/compilers/idris/wrapper.nix {};