Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix to build with Cabal 3.6 #584

Merged
merged 1 commit into from
Jun 12, 2022
Merged

Fix to build with Cabal 3.6 #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hindent.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: hindent
version: 5.3.2
version: 5.3.3
synopsis: Extensible Haskell pretty printer
description: Extensible Haskell pretty printer. Both a library and an executable.
.
Expand Down
11 changes: 10 additions & 1 deletion src/HIndent/CabalFile.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import Data.Traversable
import Distribution.ModuleName
import Distribution.PackageDescription
import Distribution.PackageDescription.Configuration
#if MIN_VERSION_Cabal(3, 6, 0)
import Distribution.Utils.Path (getSymbolicPath)
#endif
#if MIN_VERSION_Cabal(2, 2, 0)
import Distribution.PackageDescription.Parsec
#else
Expand Down Expand Up @@ -47,7 +50,13 @@ mkStanza bi mnames fpaths =
Just relpath ->
any (equalFilePath $ dropExtension relpath) modpaths ||
any (equalFilePath relpath) fpaths
in any inDir $ hsSourceDirs bi
in any inDir $ hsSourceDirs' bi
where
#if MIN_VERSION_Cabal(3, 6, 0)
hsSourceDirs' = (map getSymbolicPath) . hsSourceDirs
#else
hsSourceDirs' = hsSourceDirs
#endif

-- | Extract `Stanza`s from a package
packageStanzas :: PackageDescription -> [Stanza]
Expand Down