From 436fbf8564077ca84c2c8aaf8f538d1b425f42b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Apr 2015 15:21:15 +0200
Subject: [PATCH] uhc: convert build to Haskell NG

---
 pkgs/development/compilers/uhc/default.nix | 9 +++------
 pkgs/top-level/all-packages.nix            | 3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index d2b9ec63a73d..6096fc4e4c4a 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -1,9 +1,6 @@
-{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages,
-  shuffle,
-  hashable, mtl, network, uhc-util, uulib
-}:
+{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }:
 
-let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] );
+let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] );
 in stdenv.mkDerivation rec {
   version = "1.1.8.10";
   name = "uhc-${version}";
@@ -16,7 +13,7 @@ in stdenv.mkDerivation rec {
 
   postUnpack = "sourceRoot=\${sourceRoot}/EHC";
 
-  buildInputs = [ m4 wrappedGhc clang libtool shuffle ];
+  buildInputs = [ m4 wrappedGhc clang libtool ];
 
   configureFlags = [ "--with-gcc=${clang}/bin/clang" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1b0dba83d20..adf83147d4b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3749,8 +3749,7 @@ let
 
   uhc = callPackage ../development/compilers/uhc/default.nix ({
     stdenv = clangStdenv;
-    ghcWithPackages = haskellngPackages.ghcWithPackages;
-    inherit (haskellngPackages) shuffle hashable mtl network uhc-util uulib;
+    inherit (haskellPackages) ghcWithPackages;
   });
 
   gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded {