a9ef15b · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Revert 0e48a02 and dependency on base-noprelude...

a9ef15bJohn MacFarlane7 years ago

pandoc.cabal+41−31

compare with master

unifiedsplit

@@ -377,8 +377,7 @@ flag trypandoc

377 Default: False

378

379library

380− build-depends: base-noprelude >= 4.9 && < 5,

380+ build-depends: base >= 4.9 && < 5,

381− base-compat >= 0.9,

382 syb >= 0.1 && < 0.8,

381 syb >= 0.1 && < 0.8,

383 containers >= 0.4.2.1 && < 0.7,

382 containers >= 0.4.2.1 && < 0.7,

384 unordered-containers >= 0.2 && < 0.3,

383 unordered-containers >= 0.2 && < 0.3,

@@ -442,6 +441,10 @@ library

442 build-depends: basement >= 0.0.10,

441 build-depends: basement >= 0.0.10,

443 foundation >= 0.0.23

442 foundation >= 0.0.23

444 -- basement 0.0.9 won't build on 32-bit windows.

443 -- basement 0.0.9 won't build on 32-bit windows.

444+ if impl(ghc < 8.4)

445+ hs-source-dirs: prelude

446+ other-modules: Prelude

447+ build-depends: base-compat >= 0.9

445 if os(windows)

448 if os(windows)

446 cpp-options: -D_WINDOWS

449 cpp-options: -D_WINDOWS

447 else

450 else

@@ -469,8 +472,7 @@ library

469

472

470 default-language: Haskell2010

473 default-language: Haskell2010

471 other-extensions: NoImplicitPrelude

474 other-extensions: NoImplicitPrelude

472− hs-source-dirs: src,

475+ hs-source-dirs: src

473− prelude

474

476

475 exposed-modules: Text.Pandoc,

477 exposed-modules: Text.Pandoc,

476 Text.Pandoc.App,

478 Text.Pandoc.App,

@@ -564,8 +566,7 @@ library

564 Text.Pandoc.ImageSize,

566 Text.Pandoc.ImageSize,

565 Text.Pandoc.BCP47,

567 Text.Pandoc.BCP47,

566 Text.Pandoc.Class

568 Text.Pandoc.Class

567− other-modules: Prelude,

568− Text.Pandoc.App.CommandLineOptions,

569+ other-modules: Text.Pandoc.App.CommandLineOptions,

569 Text.Pandoc.App.FormatHeuristics,

570 Text.Pandoc.App.FormatHeuristics,

570 Text.Pandoc.App.Opt,

571 Text.Pandoc.App.Opt,

571 Text.Pandoc.App.OutputSettings,

572 Text.Pandoc.App.OutputSettings,

@@ -642,19 +643,19 @@ library

642 buildable: True

643 buildable: True

643

644

644executable pandoc

645executable pandoc

645− build-depends: pandoc,

646+ build-depends: pandoc, base >= 4.8 && < 5

646− base-noprelude >= 4.8 && < 5,

647+ if impl(ghc < 8.4)

648+ hs-source-dirs: prelude

649+ other-modules: Prelude

647− base-compat >= 0.9

650+ build-depends: base-compat >= 0.9

648 if flag(static)

651 if flag(static)

649 ld-options: -static

652 ld-options: -static

650 default-language: Haskell2010

653 default-language: Haskell2010

651 other-extensions: NoImplicitPrelude

654 other-extensions: NoImplicitPrelude

652 hs-source-dirs: .

655 hs-source-dirs: .

653− prelude

654 main-is: pandoc.hs

656 main-is: pandoc.hs

655 buildable: True

657 buildable: True

656− other-modules: Paths_pandoc,

658+ other-modules: Paths_pandoc

657− Prelude

658 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded

659 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded

659 -Wall -fno-warn-unused-do-bind

660 -Wall -fno-warn-unused-do-bind

660 -Wincomplete-record-updates

661 -Wincomplete-record-updates

@@ -669,16 +670,19 @@ executable pandoc

669

670

670executable trypandoc

671executable trypandoc

671 main-is: trypandoc.hs

672 main-is: trypandoc.hs

672− hs-source-dirs: trypandoc, prelude

673+ hs-source-dirs: trypandoc

673 default-language: Haskell2010

674 default-language: Haskell2010

674 other-extensions: NoImplicitPrelude

675 other-extensions: NoImplicitPrelude

675− other-modules: Prelude

676 if flag(trypandoc)

677− build-depends: base-noprelude, base-compat >= 0.9, aeson, pandoc,

677+ build-depends: base, aeson, pandoc,

678 text, wai-extra, wai >= 0.3, http-types

679 buildable: True

680 else

681 buildable: False

682+ if impl(ghc < 8.4)

683+ hs-source-dirs: prelude

684+ other-modules: Prelude

685+ build-depends: base-compat >= 0.9

682 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded

686 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded

683 -Wall -fno-warn-unused-do-bind

687 -Wall -fno-warn-unused-do-bind

684 -Wincomplete-record-updates

688 -Wincomplete-record-updates

@@ -694,16 +698,18 @@ executable trypandoc

694benchmark weigh-pandoc

698benchmark weigh-pandoc

695 type: exitcode-stdio-1.0

699 type: exitcode-stdio-1.0

696 main-is: weigh-pandoc.hs

700 main-is: weigh-pandoc.hs

697− hs-source-dirs: benchmark,

701+ hs-source-dirs: benchmark

698− prelude

699 build-depends: pandoc,

702 build-depends: pandoc,

700− base-noprelude >= 4.8 && < 5,

703+ base >= 4.8 && < 5,

701− base-compat >= 0.9,

702 text,

704 text,

703 weigh >= 0.0 && < 0.1,

705 weigh >= 0.0 && < 0.1,

704 mtl >= 2.2 && < 2.3

706 mtl >= 2.2 && < 2.3

707+ if impl(ghc < 8.4)

708+ hs-source-dirs: prelude

709+ other-modules: Prelude

710+ build-depends: base-compat >= 0.9

705 default-language: Haskell2010

711 default-language: Haskell2010

706− other-modules: Prelude

712+ other-extensions: NoImplicitPrelude

707 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded

713 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded

708 -Wall -fno-warn-unused-do-bind

714 -Wall -fno-warn-unused-do-bind

709 -Wincomplete-record-updates

715 -Wincomplete-record-updates

@@ -720,10 +726,8 @@ benchmark weigh-pandoc

720test-suite test-pandoc

726test-suite test-pandoc

721 type: exitcode-stdio-1.0

727 type: exitcode-stdio-1.0

722 main-is: test-pandoc.hs

728 main-is: test-pandoc.hs

723− hs-source-dirs: test,

729+ hs-source-dirs: test

724− prelude

725− build-depends: base-noprelude >= 4.8 && < 5,

730+ build-depends: base >= 4.8 && < 5,

726− base-compat >= 0.9,

727 pandoc,

731 pandoc,

728 pandoc-types >= 1.20 && < 1.21,

732 pandoc-types >= 1.20 && < 1.21,

729 mtl >= 2.2 && < 2.3,

733 mtl >= 2.2 && < 2.3,

@@ -749,8 +753,11 @@ test-suite test-pandoc

749 xml >= 1.3.12 && < 1.4,

753 xml >= 1.3.12 && < 1.4,

750 doctemplates >= 0.8.2 && < 0.9,

754 doctemplates >= 0.8.2 && < 0.9,

751 Glob >= 0.7 && < 0.11

755 Glob >= 0.7 && < 0.11

756+ if impl(ghc < 8.4)

757+ hs-source-dirs: prelude

752− other-modules: Prelude

758+ other-modules: Prelude

759+ build-depends: base-compat >= 0.9

753− Tests.Old

760+ other-modules: Tests.Old

754 Tests.Command

761 Tests.Command

755 Tests.Helpers

762 Tests.Helpers

756 Tests.Lua

763 Tests.Lua

@@ -806,6 +813,7 @@ test-suite test-pandoc

806 if os(windows)

813 if os(windows)

807 cpp-options: -D_WINDOWS

814 cpp-options: -D_WINDOWS

808 default-language: Haskell2010

815 default-language: Haskell2010

816+ other-extensions: NoImplicitPrelude

809 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded

817 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded

810 -Wall -fno-warn-unused-do-bind

818 -Wall -fno-warn-unused-do-bind

811 -Wincomplete-record-updates

819 -Wincomplete-record-updates

@@ -822,17 +830,19 @@ test-suite test-pandoc

822benchmark benchmark-pandoc

830benchmark benchmark-pandoc

823 type: exitcode-stdio-1.0

831 type: exitcode-stdio-1.0

824 main-is: benchmark-pandoc.hs

832 main-is: benchmark-pandoc.hs

825− hs-source-dirs: benchmark,

833+ hs-source-dirs: benchmark

826− prelude

827 build-depends: pandoc,

834 build-depends: pandoc,

828 time, bytestring, containers,

835 time, bytestring, containers,

829− base-noprelude >= 4.8 && < 5,

836+ base >= 4.8 && < 5,

830− base-compat >= 0.9,

831 text >= 1.1.1.0 && < 1.3,

837 text >= 1.1.1.0 && < 1.3,

832 mtl >= 2.2 && < 2.3,

838 mtl >= 2.2 && < 2.3,

833 criterion >= 1.0 && < 1.6

839 criterion >= 1.0 && < 1.6

840+ if impl(ghc < 8.4)

841+ hs-source-dirs: prelude

842+ other-modules: Prelude

843+ build-depends: base-compat >= 0.9

834 default-language: Haskell2010

844 default-language: Haskell2010

835− other-modules: Prelude

845+ other-extensions: NoImplicitPrelude

836 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded

846 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded

837 -Wall -fno-warn-unused-do-bind

847 -Wall -fno-warn-unused-do-bind

838 -Wincomplete-record-updates

848 -Wincomplete-record-updates

src/Text/Pandoc/App/CommandLineOptions.hs+2−2

@@ -30,7 +30,7 @@ import Data.Bifunctor (second)

30import Data.Char (toLower)

31import Data.List (intercalate, sort)

32#ifdef _WINDOWS

33−#if MIN_VERSION_base_noprelude(4,12,0)

33+#if MIN_VERSION_base(4,12,0)

34import Data.List (isPrefixOf)

35#endif

36#endif

@@ -1033,7 +1033,7 @@ setVariable key val (Context ctx) = Context $ M.alter go key ctx

1033-- beginning with \\ to \\?\UNC\. -- See #5127.

1034normalizePath :: FilePath -> FilePath

1035#ifdef _WINDOWS

1036−#if MIN_VERSION_base_noprelude(4,12,0)

1036+#if MIN_VERSION_base(4,12,0)

1037normalizePath fp =

1038 if "\\\\" `isPrefixOf` fp && not ("\\\\?\\" `isPrefixOf` fp)

1039 then "\\\\?\\UNC\\" ++ drop 2 fp