Merge pull request #6399 from IntersectMBO/mgalazyn/chore/remove-o-a-f-dep

Remove optparse-applicative-fork dependency where not depending on cardano-cli

Author: carbolymer

bench/cardano-profile/app/cardano-profile.hs

@@ -15,7 +15,7 @@ import           Data.Aeson.Encode.Pretty as Aeson
 import qualified Data.ByteString.Lazy.Char8 as BSL8
 -- Package: containers.
 import qualified Data.Map.Strict as Map
--- Package: optparse-applicative-fork.
+-- Package: optparse-applicative.
 import qualified Options.Applicative as OA
 -- Package: self.
 import qualified Cardano.Benchmarking.Profile as Profile

bench/cardano-profile/cardano-profile.cabal

@@ -92,7 +92,7 @@ executable cardano-profile
                       , vector
                       , bytestring
                       , containers
-                      , optparse-applicative-fork
+                      , optparse-applicative
                       , text
                       , cardano-profile
 

bench/cardano-topology/cardano-topology.cabal

@@ -65,7 +65,7 @@ executable cardano-topology
                       , bytestring
                       , containers
                       , graphviz
-                      , optparse-applicative-fork
+                      , optparse-applicative
                       , split
                       , text
                       , cardano-topology

bench/locli/locli.cabal

@@ -124,7 +124,7 @@ library
                       , filepath
                       , fingertree == 0.1.5.0
                       , hashable
-                      , optparse-applicative-fork >= 0.18.1
+                      , optparse-applicative
                       , ouroboros-consensus
                       , ouroboros-network-api ^>= 0.16
                       , sop-core
@@ -156,7 +156,7 @@ executable locli
   build-depends:        aeson
                       , cardano-prelude
                       , locli
-                      , optparse-applicative-fork
+                      , optparse-applicative
                       , text
                       , text-short
                       , transformers

bench/tx-generator/tx-generator.cabal

@@ -139,7 +139,7 @@ library
                       , mtl
                       , network
                       , network-mux
-                      , optparse-applicative-fork
+                      , optparse-applicative
                       , ouroboros-consensus >= 0.6
                       , ouroboros-consensus-cardano >= 0.5
                       , ouroboros-consensus-diffusion >= 0.7.0
@@ -202,7 +202,7 @@ executable calibrate-script
                       , directory
                       , extra
                       , filepath
-                      , optparse-applicative-fork
+                      , optparse-applicative
                       , cardano-api
                       , text
                       , transformers
@@ -235,7 +235,7 @@ test-suite tx-generator-apitest
                       , directory
                       , extra
                       , filepath
-                      , optparse-applicative-fork
+                      , optparse-applicative
                       , cardano-api
                       , cardano-cli
                       , cardano-node

cardano-node-capi/cardano-node-capi.cabal

@@ -24,5 +24,5 @@ library
                       , aeson
                       , bytestring
                       , cardano-node
-                      , optparse-applicative-fork
+                      , optparse-applicative
   hs-source-dirs:       src

cardano-node-chairman/cardano-node-chairman.cabal

@@ -50,7 +50,7 @@ executable cardano-node-chairman
                       , containers
                       , contra-tracer
                       , io-classes:{io-classes, strict-stm, si-timers}
-                      , optparse-applicative-fork
+                      , optparse-applicative
                       , ouroboros-consensus
                       , ouroboros-consensus-cardano
                       , ouroboros-network-api

cardano-node/app/cardano-node.hs

@@ -18,8 +18,8 @@ import qualified Data.Text as Text
 import qualified Data.Text.IO as Text
 import           Data.Version (showVersion)
 import           Options.Applicative
+import           Options.Applicative.Help.Pretty
 import qualified Options.Applicative as Opt
-import           Options.Applicative.Help ((<$$>))
 import           System.Info (arch, compilerName, compilerVersion, os)
 import           System.IO (hPutStrLn, stderr)
 
@@ -70,10 +70,12 @@ main = do
 
       nodeCliHelpMain :: String
       nodeCliHelpMain = renderHelpDoc 80 $
-        parserHelpHeader "cardano-node" nodeCLIParser
-        <$$> ""
-        <$$> parserHelpOptions nodeCLIParser
-
+        mconcat [ parserHelpHeader "cardano-node" nodeCLIParser
+                , line'
+                , ""
+                , line'
+                , parserHelpOptions nodeCLIParser
+                ]
 
 data Command = RunCmd PartialNodeConfiguration
              | TraceDocumentation TraceDocumentationCmd

cardano-node/cardano-node.cabal

@@ -184,7 +184,7 @@ library
                       , network
                       , network-mux >= 0.8
                       , nothunks
-                      , optparse-applicative-fork >= 0.18.1
+                      , optparse-applicative
                       , ouroboros-consensus ^>= 0.28
                       , ouroboros-consensus-cardano ^>= 0.26
                       , ouroboros-consensus-diffusion ^>= 0.24
@@ -236,7 +236,7 @@ executable cardano-node
                       , cardano-crypto-class
                       , cardano-git-rev
                       , cardano-node
-                      , optparse-applicative-fork
+                      , optparse-applicative
                       , text
 
 test-suite cardano-node-test

cardano-node/src/Cardano/Node/Parsers.hs

@@ -38,6 +38,7 @@ import           Options.Applicative hiding (str, switch)
 -- file.  See `parseStartAsNonProducingNode` and `parseValidateDB`.
 import qualified Options.Applicative as Opt
 import qualified Options.Applicative.Help as OptI
+import qualified Prettyprinter.Internal as PP
 import           System.Posix.Types (Fd (..))
 import           Text.Read (readMaybe)
 
@@ -433,4 +434,4 @@ parserHelpOptions = fromMaybe mempty . OptI.unChunk . OptI.fullDesc (Opt.prefs m
 -- | Render the help pretty document.
 renderHelpDoc :: Int -> OptI.Doc -> String
 renderHelpDoc cols =
-  (`OptI.renderShowS` "") . OptI.layoutPretty (OptI.LayoutOptions (OptI.AvailablePerLine cols 1.0))
+  (`PP.renderShowS` "") . OptI.layoutPretty (OptI.LayoutOptions (OptI.AvailablePerLine cols 1.0))