diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2020-04-17 09:50:30 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2020-04-17 09:50:55 -0700 |
| commit | a9ef15bbd574bf09827c2c25ef1cd3efaf288f7c (patch) | |
| tree | 5ff6bd77bac87bedd103d9ae3115f71039478905 /src/Text | |
| parent | f623db1d85e15f9b69cb0dbf2d7c4d907dd52be2 (diff) | |
| download | pandoc-a9ef15bbd574bf09827c2c25ef1cd3efaf288f7c.tar.gz | |
Revert 0e48a02 and dependency on base-noprelude...
which hasn't been updated for ghc 8.10.
See discussion at #6187.
Diffstat (limited to 'src/Text')
| -rw-r--r-- | src/Text/Pandoc/App/CommandLineOptions.hs | 4 |
1 files changed, 2 insertions, 2 deletions
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 |