From 92312e17e81c69dd700680ea156fc59e88c5d3e8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 May 2015 15:25:53 +0200
Subject: [PATCH] Move definitions of 'uhc' and 'jhc' to 'haskell.compiler'
 attribute set.

---
 pkgs/top-level/all-packages.nix     | 10 +---------
 pkgs/top-level/haskell-packages.nix | 10 ++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0af285825a7c..2f2d5fb220aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3757,15 +3757,6 @@ let
     };
   };
 
-  jhc = callPackage ../development/compilers/jhc {
-    inherit (haskell.packages.ghc763) ghcWithPackages;
-  };
-
-  uhc = callPackage ../development/compilers/uhc/default.nix ({
-    stdenv = clangStdenv;
-    inherit (haskellPackages) ghcWithPackages;
-  });
-
   gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
     version = "4.7-2013q3-20130916";
     releaseType = "update";
@@ -14577,6 +14568,7 @@ let
   rssglx = rss-glx; #added 2015-03-25
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
+  inherit (haskell.compiler) jhc uhc;   # 2015-05-15
 
   opentsdb = callPackage ../tools/misc/opentsdb {};
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8e0ff1834c6e..6b37718afeae 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -41,6 +41,16 @@ rec {
     ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs {
       ghc = compiler.ghc7101;
     };
+
+    jhc = callPackage ../development/compilers/jhc {
+      inherit (packages.ghc763) ghcWithPackages;
+    };
+
+    uhc = callPackage ../development/compilers/uhc/default.nix ({
+      stdenv = pkgs.clangStdenv;
+      inherit (pkgs.haskellPackages) ghcWithPackages;
+    });
+
   };
 
   packages = {