fixup! Make cabal-install use parsec parser

haskell · Jan 16, 2017 · b70cb94 · b70cb94
1 parent e426e76
commit b70cb94
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cabal-install/Distribution/Client/Targets.hs b/cabal-install/Distribution/Client/Targets.hs
@@ -563,7 +563,7 @@ readPackageTarget verbosity = traverse modifyLocation
         parseGenericPackageDescriptionMaybe (BS.toStrict bs)
 #else
     parsePackageDescription' content =
-      case parsePackageDescription . ignoreBOM . fromUTF8 . BS.Char8.unpack $ content of
+      case parseGenericPackageDescription . ignoreBOM . fromUTF8 . BS.Char8.unpack $ content of
         ParseOk _ pkg -> Just pkg
         _             -> Nothing
 #endif

diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
@@ -135,7 +135,7 @@ import Distribution.PackageDescription
 #ifdef CABAL_PARSEC
 import Distribution.PackageDescription.Parsec ( readGenericPackageDescription )
 #else
-import Distribution.PackageDescription.Parse ( readPackageDescription )
+import Distribution.PackageDescription.Parse ( readGenericPackageDescription )
 #endif
 
 import Distribution.PackageDescription.PrettyPrint

diff --git a/stack.yaml b/stack.yaml
@@ -53,10 +53,10 @@ extra-deps:
 - vector-0.12.0.0
 - zlib-0.6.1.1
 flags:
-  Cabal:
-    parsec: true
-  cabal-install:
-    parsec: true
+#  Cabal:
+#    parsec: true
+#  cabal-install:
+#    parsec: true
   time-locale-compat:
     old-locale: false
 nix: