From c67aaca6d99498d1c71b53732cfab82240672f3b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 14:16:54 +0200
Subject: [PATCH] emacs-haskell-mode: switch default to git version

We track the git version, because haskell-mode does not provide regular
releases except via MELPA, which our Emacs infrastructure does not support yet.
---
 .../editors/emacs-modes/haskell/default.nix   | 19 ++++++---
 .../editors/emacs-modes/haskell/git.nix       | 39 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 13 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/haskell/git.nix

diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 7f4373c41ba6..2f8848ca0dd7 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchurl, emacs, texinfo }:
+{ stdenv, fetchFromGitHub, emacs, texinfo }:
 
 let
-  version = "13.10";
+  version = "13.14-130-ga03bd9b";      # git describe --tags
 in
 stdenv.mkDerivation {
   name = "haskell-mode-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/haskell/haskell-mode/archive/v${version}.tar.gz";
-    sha256 = "0hcg7wpalcdw8j36m8vd854zrrgym074r7m903rpwfrhx9mlg02b";
+  src = fetchFromGitHub {
+    owner = "haskell";
+    repo = "haskell-mode";
+    rev = "v${version}";
+    sha256 = "0k4jfixzsvwpsz37f2pvbr9slz8fpcd9nwddcv2bvi4x20jp11ma";
   };
 
   buildInputs = [ emacs texinfo ];
 
-  makeFlags = "VERSION=${version} GIT_VERSION=${version}";
+  makeFlags = "VERSION=v${version} GIT_VERSION=v${version}";
 
   installPhase = ''
     mkdir -p $out/share/emacs/site-lisp
@@ -22,6 +24,11 @@ stdenv.mkDerivation {
     cp -v *.info* $out/share/info/
   '';
 
+  # The test suite must run *after* copying the generated files to $out
+  # because "make check" implies "make clean".
+  doInstallCheck = true;
+  installCheckTarget = "check";
+
   meta = {
     homepage = "http://github.com/haskell/haskell-mode";
     description = "Haskell mode for Emacs";
diff --git a/pkgs/applications/editors/emacs-modes/haskell/git.nix b/pkgs/applications/editors/emacs-modes/haskell/git.nix
deleted file mode 100644
index 20de1cae4d3a..000000000000
--- a/pkgs/applications/editors/emacs-modes/haskell/git.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs, texinfo }:
-
-let
-  version = "13.10-361-gfa09425";      # git describe --tags
-in
-stdenv.mkDerivation {
-  name = "haskell-mode-${version}";
-
-  src = fetchFromGitHub {
-    owner = "haskell";
-    repo = "haskell-mode";
-    rev = "v${version}";
-    sha256 = "1bq4gddzwjy2w1hbsmwxcamcy87amz7ksy1vmpwg0qij88fk4av9";
-  };
-
-  buildInputs = [ emacs texinfo ];
-
-  makeFlags = "VERSION=v${version} GIT_VERSION=v${version}";
-
-  installPhase = ''
-    mkdir -p $out/share/emacs/site-lisp
-    cp *.el *.elc *.hs $out/share/emacs/site-lisp/
-    mkdir -p $out/share/info
-    cp -v *.info* $out/share/info/
-  '';
-
-  # The test suite must run *after* copying the generated files to $out
-  # because "make check" implies "make clean".
-  doInstallCheck = true;
-  installCheckTarget = "check";
-
-  meta = {
-    homepage = "http://github.com/haskell/haskell-mode";
-    description = "Haskell mode for Emacs";
-
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b079bdbc0119..8ca0f13c24f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11146,7 +11146,6 @@ let
     gitModes = callPackage ../applications/editors/emacs-modes/git-modes { };
 
     haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
-    haskellModeGit = lowPrio (callPackage ../applications/editors/emacs-modes/haskell/git.nix { });
 
     hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { };