From bd996abc9cac2c68008dc6a95a3897486fa154d8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:56:27 -0500
Subject: [PATCH] Haskell packages don't mix default.nix and <version>.nix in
 the same directory

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../haskell/llvm-general-pure/{default.nix => 3.4.nix}        | 0
 .../libraries/haskell/llvm-general/{default.nix => 3.4.nix}   | 0
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/haskell/llvm-general-pure/{default.nix => 3.4.nix} (100%)
 rename pkgs/development/libraries/haskell/llvm-general/{default.nix => 3.4.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/default.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/llvm-general-pure/default.nix
rename to pkgs/development/libraries/haskell/llvm-general-pure/3.4.nix
diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/llvm-general/default.nix
rename to pkgs/development/libraries/haskell/llvm-general/3.4.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 783b868f804..105799eaf35 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1572,14 +1572,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     llvmGeneralPure = self.llvmGeneralPure_3_3;
   };
 
-  llvmGeneral = callPackage ../development/libraries/haskell/llvm-general {
+  llvmGeneral = callPackage ../development/libraries/haskell/llvm-general/3.4.nix {
     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 {};
+  llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.nix {};
 
   lrucache = callPackage ../development/libraries/haskell/lrucache {};