From 725e44cc046aaa8723f78ab420012db360eff11c Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 24 Nov 2016 19:17:46 -0500 Subject: [PATCH] hindent: fix 5.2.1 build --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f521f3100500..85970c88851f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -807,7 +807,7 @@ self: super: { }; # # Make elisp files available at a location where people expect it. - hindent = overrideCabal super.hindent (drv: { + hindent = (overrideCabal super.hindent (drv: { # We cannot easily byte-compile these files, unfortunately, because they # depend on a new version of haskell-mode that we don't have yet. postInstall = '' @@ -816,7 +816,9 @@ self: super: { ln -s $lispdir $out/share/emacs/site-lisp ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 - }); + })).override { + haskell-src-exts = self.haskell-src-exts_1_19_0; + }; # https://github.com/yesodweb/Shelly.hs/issues/106 # https://github.com/yesodweb/Shelly.hs/issues/108