From a9ef15bbd574bf09827c2c25ef1cd3efaf288f7c Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 17 Apr 2020 09:50:30 -0700 Subject: Revert 0e48a02 and dependency on base-noprelude... which hasn't been updated for ghc 8.10. See discussion at #6187. --- src/Text/Pandoc/App/CommandLineOptions.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Text') diff --git a/src/Text/Pandoc/App/CommandLineOptions.hs b/src/Text/Pandoc/App/CommandLineOptions.hs index 06ee73299..c3b05b70f 100644 --- a/src/Text/Pandoc/App/CommandLineOptions.hs +++ b/src/Text/Pandoc/App/CommandLineOptions.hs @@ -30,7 +30,7 @@ import Data.Bifunctor (second) import Data.Char (toLower) import Data.List (intercalate, sort) #ifdef _WINDOWS -#if MIN_VERSION_base_noprelude(4,12,0) +#if MIN_VERSION_base(4,12,0) import Data.List (isPrefixOf) #endif #endif @@ -1033,7 +1033,7 @@ setVariable key val (Context ctx) = Context $ M.alter go key ctx -- beginning with \\ to \\?\UNC\. -- See #5127. normalizePath :: FilePath -> FilePath #ifdef _WINDOWS -#if MIN_VERSION_base_noprelude(4,12,0) +#if MIN_VERSION_base(4,12,0) normalizePath fp = if "\\\\" `isPrefixOf` fp && not ("\\\\?\\" `isPrefixOf` fp) then "\\\\?\\UNC\\" ++ drop 2 fp -- cgit v1.2.3