hindent: build Emacs package with latest Melpa recipe

The hindent Emacs package is built with the latest Melpa recipe, but the same
source version as in haskellPackages.

pkgs/applications/editors/emacs-modes/melpa-packages.nix

@@ -94,6 +94,14 @@ self:
       # Expects bash to be at /bin/bash
       helm-rtags = markBroken super.helm-rtags;
 
+      # Build same version as Haskell package
+      hindent = super.hindent.overrideAttrs (attrs: {
+        version = external.hindent.version;
+        src = external.hindent.src;
+        packageRequires = [ self.haskell-mode ];
+        propagatedUserEnvPkgs = [ external.hindent ];
+      });
+
       # upstream issue: missing file header
       ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
 

pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix

@@ -108,6 +108,14 @@ self:
       # Expects bash to be at /bin/bash
       helm-rtags = markBroken super.helm-rtags;
 
+      # Build same version as Haskell package
+      hindent = super.hindent.overrideAttrs (attrs: {
+        version = external.hindent.version;
+        src = external.hindent.src;
+        packageRequires = [ self.haskell-mode ];
+        propagatedUserEnvPkgs = [ external.hindent ];
+      });
+
       # upstream issue: missing file header
       ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
 

pkgs/top-level/emacs-packages.nix

@@ -298,23 +298,6 @@ let
 
   helm-words = callPackage ../applications/editors/emacs-modes/helm-words { };
 
-  hindent = melpaBuild rec {
-    pname = "hindent";
-    version = external.hindent.version;
-    src = external.hindent.src;
-    packageRequires = [ haskell-mode ];
-    propagatedUserEnvPkgs = [ external.hindent ];
-    recipe = writeText "recipe" ''
-      (hindent
-       :repo "commercialhaskell/hindent" :fetcher github
-       :files ("elisp/*.el"))
-    '';
-    meta = {
-      description = "Indent haskell code using the \"hindent\" program";
-      license = bsd3;
-    };
-  };
-
   icicles = callPackage ../applications/editors/emacs-modes/icicles { };
 
   redshank = callPackage ../applications/editors/emacs-modes/redshank { };