From e95208ea862f3b0771470bd673e8fc86a5a048f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 20 Sep 2014 14:23:42 +0200
Subject: [PATCH] haskell-ghc-mod: update default to version 5.x

---
 .../libraries/haskell/ghc-mod/4.1.6.nix       | 51 -------------------
 .../ghc-mod/{5.0.1.2.nix => default.nix}      |  0
 pkgs/top-level/haskell-packages.nix           |  4 +-
 3 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix
 rename pkgs/development/libraries/haskell/ghc-mod/{5.0.1.2.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix b/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix
deleted file mode 100644
index a9c06e80f8af..000000000000
--- a/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, convertible, deepseq, doctest, emacs, filepath
-, ghcSybUtils, hlint, hspec, ioChoice, syb, time, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "ghc-mod";
-  version = "4.1.6";
-  sha256 = "093wafaizr2xf7vmzj6f3vs8ch0vpcmwlrja6af6hshgaj2d80qs";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    Cabal convertible deepseq filepath ghcSybUtils hlint ioChoice syb
-    time transformers
-  ];
-  testDepends = [
-    Cabal convertible deepseq doctest filepath ghcSybUtils hlint hspec
-    ioChoice syb time transformers
-  ];
-  buildTools = [ emacs ];
-  doCheck = false;
-  configureFlags = "--datasubdir=${self.pname}-${self.version}";
-  postInstall = ''
-    cd $out/share/$pname-$version
-    make
-    rm Makefile
-    cd ..
-    mkdir -p "$out/share/emacs"
-    mv $pname-$version emacs/site-lisp
-    mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
-    cat - > $out/bin/ghc-mod <<EOF
-    #! ${self.stdenv.shell}
-    COMMAND=\$1
-    shift
-    eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
-    EOF
-    chmod +x $out/bin/ghc-mod
-  '';
-  meta = {
-    homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
-    description = "Happy Haskell Programming";
-    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.ocharles
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.2.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/ghc-mod/5.0.1.2.nix
rename to pkgs/development/libraries/haskell/ghc-mod/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f6a6c46e0e88..372f7b1863ee 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -908,9 +908,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {};
 
-  ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix { inherit (pkgs) emacs; };
-  ghcMod_5_0_1_2 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.2.nix { inherit (pkgs) emacs; };
-  ghcMod = self.ghcMod_4_1_6;
+  ghcMod = callPackage ../development/libraries/haskell/ghc-mod { inherit (pkgs) emacs; };
 
   ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};