[Git][haskell-team/package-plan][master] Add fourmolu

[Clint Adams (@clint)]

Clint Adams pushed to branch master at Debian Haskell Group / package-plan


Commits:
7ae3897b by Clint Adams at 2026-07-29T12:45:48-04:00
Add fourmolu

- - - - -


4 changed files:

- packages.txt
- + patches/fourmolu/0.18.0.0/older-deps
- + patches/fourmolu/0.18.0.0/path-to-executable
- + patches/fourmolu/0.18.0.0/series


Changes:

=====================================
packages.txt
=====================================
@@ -306,6 +306,7 @@ fold-debounce 0.2.0.16
 foldl 1.4.18
 formatting 7.2.0
 foundation 0.0.30
+fourmolu 0.18.0.0
 fp-ieee 0.1.0.6
 free 5.2
 from-sum 0.2.3.0


=====================================
patches/fourmolu/0.18.0.0/older-deps
=====================================
@@ -0,0 +1,52 @@
+--- a/fourmolu.cabal
++++ b/fourmolu.cabal
+@@ -100,7 +100,7 @@ library
+   other-modules: GHC.DynFlags
+   default-language: GHC2021
+   build-depends:
+-    Cabal-syntax >=3.14 && <3.15,
++    Cabal-syntax >=3.12 && <3.13,
+     Diff >=0.4 && <2,
+     MemoTrie >=0.6 && <0.7,
+     ansi-terminal >=0.10 && <1.2,
+@@ -152,7 +152,7 @@ executable fourmolu
+   autogen-modules: Paths_fourmolu
+   default-language: GHC2021
+   build-depends:
+-    Cabal-syntax >=3.14 && <3.15,
++    Cabal-syntax >=3.12 && <3.13,
+     base >=4.12 && <5,
+     containers >=0.5 && <0.8,
+     directory ^>=1.3,
+@@ -210,7 +210,7 @@ test-suite tests
+ 
+   default-language: GHC2021
+   build-depends:
+-    Cabal-syntax >=3.14 && <3.15,
++    Cabal-syntax >=3.12 && <3.13,
+     QuickCheck >=2.14,
+     base >=4.14 && <5,
+     choice >=0.2.4.1 && <0.3,
+--- a/src/Ormolu/Utils/Cabal.hs
++++ b/src/Ormolu/Utils/Cabal.hs
+@@ -228,17 +228,17 @@ getExtensionAndDepsMap cabalFile Generic
+     extractFromLibrary Library {..} =
+       extractFromBuildInfo (ModuleName.toFilePath <$> exposedModules) libBuildInfo
+     extractFromExecutable Executable {..} =
+-      extractFromBuildInfo [getSymbolicPath modulePath] buildInfo
++      extractFromBuildInfo [modulePath] buildInfo
+     extractFromTestSuite TestSuite {..} =
+       extractFromBuildInfo mainPath testBuildInfo
+       where
+         mainPath = case testInterface of
+-          TestSuiteExeV10 _ p -> [getSymbolicPath p]
++          TestSuiteExeV10 _ p -> [p]
+           TestSuiteLibV09 _ p -> [ModuleName.toFilePath p]
+           TestSuiteUnsupported {} -> []
+     extractFromBenchmark Benchmark {..} =
+       extractFromBuildInfo mainPath benchmarkBuildInfo
+       where
+         mainPath = case benchmarkInterface of
+-          BenchmarkExeV10 _ p -> [getSymbolicPath p]
++          BenchmarkExeV10 _ p -> [p]
+           BenchmarkUnsupported {} -> []


=====================================
patches/fourmolu/0.18.0.0/path-to-executable
=====================================
@@ -0,0 +1,20 @@
+--- a/tests/Ormolu/Integration/Utils.hs
++++ b/tests/Ormolu/Integration/Utils.hs
+@@ -10,7 +10,7 @@ module Ormolu.Integration.Utils
+ where
+ 
+ import Control.Monad (when)
+-import System.Directory (findExecutable)
++import System.Directory (getCurrentDirectory)
+ import System.Environment (getEnvironment)
+ import System.Exit (ExitCode (..))
+ import System.Process (CreateProcess (..), readCreateProcessWithExitCode)
+@@ -18,7 +18,7 @@ import System.Process qualified as Proce
+ 
+ -- | Find a `fourmolu` executable on PATH.
+ getFourmoluExe :: IO FilePath
+-getFourmoluExe = findExecutable "fourmolu" >>= maybe (fail "Could not find fourmolu executable") return
++getFourmoluExe = getCurrentDirectory >>= \cwd -> return (cwd <> "/dist-ghc/build/fourmolu/fourmolu")
+ 
+ -- | Like 'System.Process.readProcess', except without specifying stdin and
+ -- with better failure messages.


=====================================
patches/fourmolu/0.18.0.0/series
=====================================
@@ -0,0 +1,2 @@
+older-deps
+path-to-executable



View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/commit/7ae3897b80f72820d3008c8b3d2ba5a0ede05482

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/commit/7ae3897b80f72820d3008c8b3d2ba5a0ede05482
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20260729/e30a9344/attachment-0001.htm>