Skip to content

Commit ce26c3c

Browse files
committed
fix cabal-instlal-solver-3.14 API change
#10546 changed the Solver API by renaming a function and was backported to 3.14 in #10753 This commit reverts the renaming but not anything else from #10546.
1 parent 6cb1e7c commit ce26c3c

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

cabal-install-solver/src/Distribution/Solver/Types/ProjectConfigPath.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module Distribution.Solver.Types.ProjectConfigPath
1212

1313
-- * Messages
1414
, docProjectConfigPath
15-
, docProjectConfigFiles
15+
, docProjectConfigPaths
1616
, cyclicalImportMsg
1717
, docProjectConfigPathFailReason
1818

@@ -133,11 +133,11 @@ docProjectConfigPath (ProjectConfigPath (p :| ps)) = vcat $
133133
-- , ProjectConfigPath ("project-cabal/pkgs/integration-tests.config" :| ["project-cabal/pkgs.config","cabal.project"])
134134
-- , ProjectConfigPath ("project-cabal/pkgs/tests.config" :| ["project-cabal/pkgs.config","cabal.project"])
135135
-- ]
136-
-- return . render $ docProjectConfigFiles ps
136+
-- return . render $ docProjectConfigPaths ps
137137
-- :}
138138
-- "- cabal.project\n- project-cabal/constraints.config\n- project-cabal/ghc-latest.config\n- project-cabal/ghc-options.config\n- project-cabal/pkgs.config\n- project-cabal/pkgs/benchmarks.config\n- project-cabal/pkgs/buildinfo.config\n- project-cabal/pkgs/cabal.config\n- project-cabal/pkgs/install.config\n- project-cabal/pkgs/integration-tests.config\n- project-cabal/pkgs/tests.config"
139-
docProjectConfigFiles :: [ProjectConfigPath] -> Doc
140-
docProjectConfigFiles ps = vcat
139+
docProjectConfigPaths :: [ProjectConfigPath] -> Doc
140+
docProjectConfigPaths ps = vcat
141141
[ text "-" <+> text p
142142
| p <- ordNub [ p | ProjectConfigPath (p :| _) <- ps ]
143143
]

cabal-install/src/Distribution/Client/ProjectConfig.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ renderBadPackageLocations (BadPackageLocations provenance bpls)
935935

936936
renderExplicit =
937937
"When using configuration from:\n"
938-
++ render (nest 2 . docProjectConfigFiles $ mapMaybe getExplicit (Set.toList provenance))
938+
++ render (nest 2 . docProjectConfigPaths $ mapMaybe getExplicit (Set.toList provenance))
939939
++ "\nThe following errors occurred:\n"
940940
++ render (nest 2 $ vcat ((text "-" <+>) . text <$> map renderBadPackageLocation bpls))
941941

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
synopsis: Revert renaming from #10546
2+
packages: cabal-install-solver
3+
4+
description: {
5+
6+
https://github.com/haskell/cabal/pull/10546 changed the Solver API by
7+
renaming a function and was backported to 3.14 in
8+
https://github.com/haskell/cabal/pull/10753. In particular,
9+
`docProjectConfigPaths` was renamed to `docProjectConfigFiles`.
10+
This change reverts the renaming but not anything else from #10546.
11+
12+
}

0 commit comments

Comments
 (0)