From 9c2ae2f161b44e1ec79773598d4fbfd35348a800 Mon Sep 17 00:00:00 2001 From: Huw Campbell Date: Sat, 6 Jun 2026 18:20:17 +1000 Subject: [PATCH] Refer to GHC when acting on GHC quirks --- optparse-applicative.cabal | 2 +- src/Options/Applicative/BashCompletion.hs | 4 ++-- src/Options/Applicative/Help/Core.hs | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/optparse-applicative.cabal b/optparse-applicative.cabal index 07166819..ac693691 100644 --- a/optparse-applicative.cabal +++ b/optparse-applicative.cabal @@ -121,7 +121,7 @@ library if flag(process) build-depends: process >= 1.0 && < 1.7 - if !impl(ghc >= 8) && !impl(mhs) + if impl(ghc < 8) build-depends: semigroups >= 0.10 && < 0.21 , fail == 4.9.* diff --git a/src/Options/Applicative/BashCompletion.hs b/src/Options/Applicative/BashCompletion.hs index 13225f48..24a3ebc3 100644 --- a/src/Options/Applicative/BashCompletion.hs +++ b/src/Options/Applicative/BashCompletion.hs @@ -14,7 +14,7 @@ module Options.Applicative.BashCompletion import Control.Applicative import Prelude -#if !defined(__MHS__) +#if !MIN_VERSION_base(4,16,0) import Data.Foldable ( asum ) #endif @@ -232,7 +232,7 @@ words. Tab characters separate items from descriptions. -} --- | Generated fish shell completion script +-- | Generated fish shell completion script fishCompletionScript :: String -> String -> String fishCompletionScript prog progn = unlines [ " function _" ++ progn diff --git a/src/Options/Applicative/Help/Core.hs b/src/Options/Applicative/Help/Core.hs index 202eaf07..50328bb0 100644 --- a/src/Options/Applicative/Help/Core.hs +++ b/src/Options/Applicative/Help/Core.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} module Options.Applicative.Help.Core ( cmdDesc, briefDesc,