From 8d62af8ae093fab9f6d26332ec6a6afd5aca0cf8 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 1 May 2024 23:00:15 -1000 Subject: [PATCH] imp: Revert problematic process-1.6.19.0 bound, it seems not strictly needed [#2149] --- hledger-lib/package.yaml | 47 +++++++++++++++++++--------------------- hledger-ui/package.yaml | 2 +- hledger/package.yaml | 2 +- stack.yaml | 4 +--- stack8.10.yaml | 3 --- stack9.0.yaml | 3 --- stack9.2.yaml | 3 --- stack9.4.yaml | 4 ---- stack9.6.yaml | 6 +---- 9 files changed, 26 insertions(+), 48 deletions(-) diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index 76d555f14..8cf5f4381 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -181,33 +181,30 @@ tests: dependencies: - hledger-lib - # Disable doctest for now because its dependence on ghc prevents reliable use of the - # newer security-fixed process-1.6.19.0. - # # Note when run by cabal, doctest requires a ghc environment file, # so we ensure this is generated, see cabal.project. # https://github.com/simonmichael/hledger/issues/1139 - # doctest: - # source-dirs: test - # main: doctests.hs # can't call it doctest.hs ("File name does not match module name") - # other-modules: [] # prevent double compilation, https://github.com/sol/hpack/issues/188 - # dependencies: - # # prefer the latest doctest - # - doctest >=0.18.1 - # - Glob >=0.7 + doctest: + source-dirs: test + main: doctests.hs # can't call it doctest.hs ("File name does not match module name") + other-modules: [] # prevent double compilation, https://github.com/sol/hpack/issues/188 + dependencies: + # prefer the latest doctest + - doctest >=0.18.1 + - Glob >=0.7 - # when: - # # disable doctest with GHC 9.0, https://github.com/sol/doctest/issues/301 - # - condition: impl(ghc >= 9.0) && impl(ghc < 9.2) - # buildable: false + when: + # disable doctest with GHC 9.0, https://github.com/sol/doctest/issues/301 + - condition: impl(ghc >= 9.0) && impl(ghc < 9.2) + buildable: false - # # ghc 8.4+ on mac needs this workaround. See - # # https://github.com/sol/doctest/issues/199 - # # https://ghc.haskell.org/trac/ghc/ticket/15105#comment:10 : - # # ~$ locate HSinteger-gmp-1.0.2.0.o - # # /Users/simon/.stack/programs/x86_64-osx/ghc-8.4.3/lib/ghc-8.4.2/integer-gmp-1.0.2.0/HSinteger-gmp-1.0.2.0.o - # # ~$ mv /Users/simon/.stack/programs/x86_64-osx/ghc-8.4.3/lib/ghc-8.4.2/integer-gmp-1.0.2.0/HSinteger-gmp-1.0.2.0.o{,_DISABLE_GHC_ISSUE_15105} - # # Should probably disable it by default: - # #when: - # # - condition: os(darwin) && impl(ghc >= 8.4) - # # buildable: false + # ghc 8.4+ on mac needs this workaround. See + # https://github.com/sol/doctest/issues/199 + # https://ghc.haskell.org/trac/ghc/ticket/15105#comment:10 : + # ~$ locate HSinteger-gmp-1.0.2.0.o + # /Users/simon/.stack/programs/x86_64-osx/ghc-8.4.3/lib/ghc-8.4.2/integer-gmp-1.0.2.0/HSinteger-gmp-1.0.2.0.o + # ~$ mv /Users/simon/.stack/programs/x86_64-osx/ghc-8.4.3/lib/ghc-8.4.2/integer-gmp-1.0.2.0/HSinteger-gmp-1.0.2.0.o{,_DISABLE_GHC_ISSUE_15105} + # Should probably disable it by default: + #when: + # - condition: os(darwin) && impl(ghc >= 8.4) + # buildable: false diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 2c3d1b574..8808a0508 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -101,7 +101,7 @@ library: - microlens-platform >=0.2.3.1 - megaparsec >=7.0.0 && <9.7 - mtl >=2.2.1 - - process >=1.6.19.0 + - process >=1.2 - safe >=0.3.20 - split >=0.1 - text >=1.2.4.1 diff --git a/hledger/package.yaml b/hledger/package.yaml index 17385b80c..df88c686e 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -120,7 +120,7 @@ dependencies: - megaparsec >=7.0.0 && <9.7 - microlens >=0.4 - mtl >=2.2.1 -- process >=1.6.19.0 +- process - regex-tdfa - safe >=0.3.20 - shakespeare >=2.0.2.2 diff --git a/stack.yaml b/stack.yaml index a39f784f8..34b07eace 100644 --- a/stack.yaml +++ b/stack.yaml @@ -9,9 +9,7 @@ packages: - hledger-web extra-deps: -- process-1.6.19.0 # for HSEC-2024-0003 -- haskeline-0.8.2.1 # must be specified again even though in the snapshot because process is a core lib depending on it - +# needed only for dev builds when the ghcdebug flag is enabled: - ghc-debug-convention-0.6.0.0 - ghc-debug-stub-0.6.0.0 diff --git a/stack8.10.yaml b/stack8.10.yaml index c6caef8d8..028c60045 100644 --- a/stack8.10.yaml +++ b/stack8.10.yaml @@ -9,9 +9,6 @@ packages: - hledger-web extra-deps: -- process-1.6.19.0 # for HSEC-2024-0003 -- Cabal-3.2.1.0 - - safe-0.3.21 # for hledger-lib: - doctest-0.20.0 diff --git a/stack9.0.yaml b/stack9.0.yaml index 288458a57..3bb1e2afc 100644 --- a/stack9.0.yaml +++ b/stack9.0.yaml @@ -13,9 +13,6 @@ packages: - hledger-web extra-deps: -- process-1.6.19.0 # for HSEC-2024-0003 -- Cabal-3.4.1.0 - - megaparsec-9.3.0 - safe-0.3.21 # for hledger-lib: diff --git a/stack9.2.yaml b/stack9.2.yaml index cd53b07d7..44ec291de 100644 --- a/stack9.2.yaml +++ b/stack9.2.yaml @@ -9,9 +9,6 @@ packages: - hledger-web extra-deps: -- process-1.6.19.0 # for HSEC-2024-0003 -- Cabal-3.6.3.0 - - megaparsec-9.3.0 - safe-0.3.21 # for hledger-lib: diff --git a/stack9.4.yaml b/stack9.4.yaml index 33d460f7e..9a2bec054 100644 --- a/stack9.4.yaml +++ b/stack9.4.yaml @@ -9,10 +9,6 @@ packages: - hledger-web extra-deps: -- process-1.6.19.0 # for HSEC-2024-0003 -- Cabal-3.8.1.0 -- haskeline-0.8.2.1 - - safe-0.3.21 - brick-2.3.1 - vty-6.2 diff --git a/stack9.6.yaml b/stack9.6.yaml index d70739261..26542925f 100644 --- a/stack9.6.yaml +++ b/stack9.6.yaml @@ -9,11 +9,7 @@ packages: - hledger-web extra-deps: -- process-1.6.19.0 # for HSEC-2024-0003 -- Cabal-3.10.1.0 -- haskeline-0.8.2.1 - -- vty-windows-0.2.0.2 # not yet in stackage +- vty-windows-0.2.0.1 # not yet in stackage nix: pure: false