From 9556f2dd7b1480405bf7d83525c49f5746f88a0e Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Tue, 30 Dec 2025 22:26:46 +0100 Subject: [PATCH] Remove optparse-applicative-fork dependency where not depending on cardano-cli --- bench/cardano-profile/app/cardano-profile.hs | 2 +- bench/cardano-profile/cardano-profile.cabal | 2 +- bench/cardano-topology/cardano-topology.cabal | 2 +- bench/locli/locli.cabal | 4 ++-- bench/tx-generator/tx-generator.cabal | 6 +++--- cardano-node-capi/cardano-node-capi.cabal | 2 +- cardano-node-chairman/cardano-node-chairman.cabal | 2 +- cardano-node/app/cardano-node.hs | 12 +++++++----- cardano-node/cardano-node.cabal | 4 ++-- cardano-node/src/Cardano/Node/Parsers.hs | 3 ++- cardano-tracer/cardano-tracer.cabal | 8 ++++---- 11 files changed, 25 insertions(+), 22 deletions(-) diff --git a/bench/cardano-profile/app/cardano-profile.hs b/bench/cardano-profile/app/cardano-profile.hs index 1fedf76e3af..3bc8643b44e 100644 --- a/bench/cardano-profile/app/cardano-profile.hs +++ b/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 diff --git a/bench/cardano-profile/cardano-profile.cabal b/bench/cardano-profile/cardano-profile.cabal index a9550d9a2af..c5fbd6b165c 100644 --- a/bench/cardano-profile/cardano-profile.cabal +++ b/bench/cardano-profile/cardano-profile.cabal @@ -92,7 +92,7 @@ executable cardano-profile , vector , bytestring , containers - , optparse-applicative-fork + , optparse-applicative , text , cardano-profile diff --git a/bench/cardano-topology/cardano-topology.cabal b/bench/cardano-topology/cardano-topology.cabal index a7e58236d34..226c09b3dec 100644 --- a/bench/cardano-topology/cardano-topology.cabal +++ b/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 diff --git a/bench/locli/locli.cabal b/bench/locli/locli.cabal index 46c7cbafa8f..54da6f037e1 100644 --- a/bench/locli/locli.cabal +++ b/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 diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal index 5beffe64a9d..22f2d7a38e4 100644 --- a/bench/tx-generator/tx-generator.cabal +++ b/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 diff --git a/cardano-node-capi/cardano-node-capi.cabal b/cardano-node-capi/cardano-node-capi.cabal index 42f8be16ca8..dfdfb6a32d8 100644 --- a/cardano-node-capi/cardano-node-capi.cabal +++ b/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 diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal index 5d2f7626072..6c3a08e1faf 100644 --- a/cardano-node-chairman/cardano-node-chairman.cabal +++ b/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 diff --git a/cardano-node/app/cardano-node.hs b/cardano-node/app/cardano-node.hs index a550735de7a..17ca69bd52f 100644 --- a/cardano-node/app/cardano-node.hs +++ b/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 diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 8eac42d6384..ddfe290dffa 100644 --- a/cardano-node/cardano-node.cabal +++ b/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 diff --git a/cardano-node/src/Cardano/Node/Parsers.hs b/cardano-node/src/Cardano/Node/Parsers.hs index 86773d3726c..077e9675b62 100644 --- a/cardano-node/src/Cardano/Node/Parsers.hs +++ b/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)) diff --git a/cardano-tracer/cardano-tracer.cabal b/cardano-tracer/cardano-tracer.cabal index fd7e123f45a..1879a35af1b 100644 --- a/cardano-tracer/cardano-tracer.cabal +++ b/cardano-tracer/cardano-tracer.cabal @@ -257,7 +257,7 @@ library demo-forwarder-lib , generic-data , network , network-mux - , optparse-applicative-fork >= 0.18.1 + , optparse-applicative , ouroboros-network-api , ouroboros-network-framework , tasty-quickcheck @@ -302,7 +302,7 @@ library demo-acceptor-lib , extra , filepath , generic-data - , optparse-applicative-fork >= 0.18.1 + , optparse-applicative , ouroboros-network-api , stm <2.5.2 || >=2.5.3 , tasty-quickcheck @@ -363,7 +363,7 @@ test-suite cardano-tracer-test , generic-data , network , network-mux - , optparse-applicative-fork >= 0.18.1 + , optparse-applicative , ouroboros-network-api , ouroboros-network-framework , stm <2.5.2 || >=2.5.3 @@ -423,7 +423,7 @@ test-suite cardano-tracer-test-ext , Glob , network , network-mux - , optparse-applicative-fork >= 0.18.1 + , optparse-applicative , ouroboros-network ^>= 0.22.4 , ouroboros-network-api , ouroboros-network-framework