Skip to content

Commit b70cb94

Browse files
committed
fixup! Make cabal-install use parsec parser
1 parent e426e76 commit b70cb94

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

cabal-install/Distribution/Client/Targets.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ readPackageTarget verbosity = traverse modifyLocation
563563
parseGenericPackageDescriptionMaybe (BS.toStrict bs)
564564
#else
565565
parsePackageDescription' content =
566-
case parsePackageDescription . ignoreBOM . fromUTF8 . BS.Char8.unpack $ content of
566+
case parseGenericPackageDescription . ignoreBOM . fromUTF8 . BS.Char8.unpack $ content of
567567
ParseOk _ pkg -> Just pkg
568568
_ -> Nothing
569569
#endif

cabal-install/Main.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ import Distribution.PackageDescription
135135
#ifdef CABAL_PARSEC
136136
import Distribution.PackageDescription.Parsec ( readGenericPackageDescription )
137137
#else
138-
import Distribution.PackageDescription.Parse ( readPackageDescription )
138+
import Distribution.PackageDescription.Parse ( readGenericPackageDescription )
139139
#endif
140140

141141
import Distribution.PackageDescription.PrettyPrint

stack.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ extra-deps:
5353
- vector-0.12.0.0
5454
- zlib-0.6.1.1
5555
flags:
56-
Cabal:
57-
parsec: true
58-
cabal-install:
59-
parsec: true
56+
# Cabal:
57+
# parsec: true
58+
# cabal-install:
59+
# parsec: true
6060
time-locale-compat:
6161
old-locale: false
6262
nix:

0 commit comments

Comments
 (0)