From 1d587c2e66f44e84fd203ea5c7631b6ab2e37496 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Jul 2018 17:51:13 +0200
Subject: hledger-ui: fix build with ghc 8.4.x

---
 pkgs/development/haskell-modules/configuration-common.nix    | 6 +++---
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index dfc67240632c..c3b04c22c2aa 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -989,7 +989,7 @@ self: super: {
       cp -v embeddedfiles/*.info* $out/share/info/
     '';
   });
-  hledger-ui = overrideCabal super.hledger-ui (drv: {
+  hledger-ui = (overrideCabal super.hledger-ui (drv: {
     postInstall = ''
       for i in $(seq 1 9); do
         for j in *.$i; do
@@ -999,8 +999,8 @@ self: super: {
       done
       mkdir -p $out/share/info
       cp -v *.info* $out/share/info/
-    '';
-  });
+    '';  # hledger-ui 1.10 needs newer fsnotify than lts-11 provides.
+  })).overrideScope (self: super: { fsnotify = self.fsnotify_0_3_0_1; });
   hledger-web = overrideCabal super.hledger-web (drv: {
     postInstall = ''
       for i in $(seq 1 9); do
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 2647296ee5b1..6ea2db37d21d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -97,7 +97,6 @@ self: super: {
   # Hledger depends indirectly on different versions of base-compat. The
   # override can probably be removed once we update to LTS 12.x.
   hledger-lib = super.hledger-lib.overrideScope (self: super: { base-compat = self.base-compat_0_10_4; });
-  hledger-ui = super.hledger-ui.overrideScope (self: super: { fsnotify = self.fsnotify_0_3_0_1; });
   hledger = super.hledger.overrideScope (self: super: {
     base-compat = self.base-compat_0_10_4;
     aeson = self.aeson_1_4_0_0;
-- 
cgit 1.4.1