From c455b521a9b5f60e03e3fd89599c55a2886d3875 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Wed, 24 Feb 2021 12:42:36 +0100
Subject: [PATCH] Fix ghcup-tui

---
 app/ghcup/BrickMain.hs | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/ghcup/BrickMain.hs b/app/ghcup/BrickMain.hs
index 80a96ef..58cc19d 100644
--- a/app/ghcup/BrickMain.hs
+++ b/app/ghcup/BrickMain.hs
@@ -486,19 +486,12 @@ del' BrickState { appData = BrickData {..} } (_, ListResult {..}) = do
   let run = runLogger . flip runReaderT settings . runE @'[NotInstalled, VerNotFound]
 
   (run $ do
+      vi <- liftE @_ @'[VerNotFound] $ getVersionInfo lVer lTool dls
+        ?? VerNotFound lVer lTool
       case lTool of
-        GHC   -> do
-          vi <- liftE @_ @'[VerNotFound] $ getVersionInfo lVer Cabal dls
-            ?? VerNotFound lVer Cabal
-          liftE $ rmGHCVer (GHCTargetVersion lCross lVer) $> Just vi
-        Cabal -> do
-          vi <- liftE @_ @'[VerNotFound] $ getVersionInfo lVer Cabal dls
-            ?? VerNotFound lVer Cabal
-          liftE $ rmCabalVer lVer $> Just vi
-        HLS   -> do
-          vi <- liftE @_ @'[VerNotFound] $ getVersionInfo lVer Cabal dls
-            ?? VerNotFound lVer Cabal
-          liftE $ rmHLSVer lVer $> Just vi
+        GHC   -> liftE $ rmGHCVer (GHCTargetVersion lCross lVer) $> Just vi
+        Cabal -> liftE $ rmCabalVer lVer $> Just vi
+        HLS   -> liftE $ rmHLSVer lVer $> Just vi
         GHCup -> pure Nothing
     )
     >>= \case