From 4752d7201ce0298957671549afe9a9275ca98fa9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 26 Jan 2012 14:20:11 +0000
Subject: [PATCH] haskell-ghc-mod: don't hard-code a specific version of
 emacsPackages into the expression itself

Instead, one of the available version is chosen in haskell-packages.nix, when
the expression is instantiated.

Also updated the meta section.

svn path=/nixpkgs/trunk/; revision=31856
---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 8 +++++---
 pkgs/top-level/haskell-packages.nix                    | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 3d4d8927a83c..945e9ee35e03 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -1,4 +1,4 @@
-{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacs, emacs23Packages }:
+{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacsPackages }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
@@ -7,8 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     attoparsec attoparsecEnumerator ghcPaths hlint regexPosix
   ];
-#  buildTools = [emacs emacs23];
-  propagatedBuildInputs = [emacs emacs23Packages.haskellMode];
+  propagatedBuildInputs = [emacsPackages.emacs emacsPackages.haskellMode];
   isExecutable = true;
   postInstall = ''
     cd $out/share/$pname-$version
@@ -20,11 +19,14 @@ cabal.mkDerivation (self: {
   '';
 
   meta = {
+    homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
     description = "Happy Haskell programming on Emacs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
+      self.stdenv.lib.maintainers.andres
       self.stdenv.lib.maintainers.bluescreen303
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 04bc3fdae116..829381c73177 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -683,7 +683,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
 
-  ghcMod = callPackage ../development/libraries/haskell/ghc-mod {};
+  ghcMod = callPackage ../development/libraries/haskell/ghc-mod {
+    emacsPackages = pkgs.emacs23Packages;
+  };
 
   ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};