@@ -377,7 +377,8 @@ flag trypandoc
377377 Default: False
378378
379379library
380− build-depends: base >= 4.9 && < 5,
380+ build-depends: base-noprelude >= 4.9 && < 5,
381+ base-compat >= 0.9,
381382 syb >= 0.1 && < 0.8,
382383 containers >= 0.4.2.1 && < 0.7,
383384 unordered-containers >= 0.2 && < 0.3,
@@ -440,10 +441,6 @@ library
440441 build-depends: basement >= 0.0.10,
441442 foundation >= 0.0.23
442443 -- basement 0.0.9 won't build on 32-bit windows.
443− if impl(ghc < 8.4)
444− hs-source-dirs: prelude
445− other-modules: Prelude
446− build-depends: base-compat >= 0.9
447444 if os(windows)
448445 cpp-options: -D_WINDOWS
449446 else
@@ -471,7 +468,8 @@ library
471468
472469 default-language: Haskell2010
473470 other-extensions: NoImplicitPrelude
474− hs-source-dirs: src
471+ hs-source-dirs: src,
472+ prelude
475473
476474 exposed-modules: Text.Pandoc,
477475 Text.Pandoc.App,
@@ -565,7 +563,8 @@ library
565563 Text.Pandoc.ImageSize,
566564 Text.Pandoc.BCP47,
567565 Text.Pandoc.Class
568− other-modules: Text.Pandoc.App.CommandLineOptions,
566+ other-modules: Prelude,
567+ Text.Pandoc.App.CommandLineOptions,
569568 Text.Pandoc.App.FormatHeuristics,
570569 Text.Pandoc.App.Opt,
571570 Text.Pandoc.App.OutputSettings,
@@ -640,19 +639,19 @@ library
640639 buildable: True
641640
642641executable pandoc
643− build-depends: pandoc, base >= 4.8 && < 5
644− if impl(ghc < 8.4)
645− hs-source-dirs: prelude
646− other-modules: Prelude
647− build-depends: base-compat >= 0.9
642+ build-depends: pandoc,
643+ base-noprelude >= 4.8 && < 5,
644+ base-compat >= 0.9
648645 if flag(static)
649646 ld-options: -static
650647 default-language: Haskell2010
651648 other-extensions: NoImplicitPrelude
652649 hs-source-dirs: .
650+ prelude
653651 main-is: pandoc.hs
654652 buildable: True
655− other-modules: Paths_pandoc
653+ other-modules: Paths_pandoc,
654+ Prelude
656655 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
657656 -Wall -fno-warn-unused-do-bind
658657 -Wincomplete-record-updates
@@ -667,19 +666,16 @@ executable pandoc
667666
668667executable trypandoc
669668 main-is: trypandoc.hs
670− hs-source-dirs: trypandoc
669+ hs-source-dirs: trypandoc, prelude
671670 default-language: Haskell2010
672671 other-extensions: NoImplicitPrelude
672+ other-modules: Prelude
673673 if flag(trypandoc)
674− build-depends: base, aeson, pandoc,
674+ build-depends: base-noprelude, base-compat >= 0.9, aeson, pandoc,
675675 text, wai-extra, wai >= 0.3, http-types
676676 buildable: True
677677 else
678678 buildable: False
679− if impl(ghc < 8.4)
680− hs-source-dirs: prelude
681− other-modules: Prelude
682− build-depends: base-compat >= 0.9
683679 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
684680 -Wall -fno-warn-unused-do-bind
685681 -Wincomplete-record-updates
@@ -695,18 +691,16 @@ executable trypandoc
695691benchmark weigh-pandoc
696692 type: exitcode-stdio-1.0
697693 main-is: weigh-pandoc.hs
698− hs-source-dirs: benchmark
694+ hs-source-dirs: benchmark,
695+ prelude
699696 build-depends: pandoc,
700− base >= 4.8 && < 5,
697+ base-noprelude >= 4.8 && < 5,
698+ base-compat >= 0.9,
701699 text,
702700 weigh >= 0.0 && < 0.1,
703701 mtl >= 2.2 && < 2.3
704− if impl(ghc < 8.4)
705− hs-source-dirs: prelude
706− other-modules: Prelude
707− build-depends: base-compat >= 0.9
708702 default-language: Haskell2010
709− other-extensions: NoImplicitPrelude
703+ other-modules: Prelude
710704 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
711705 -Wall -fno-warn-unused-do-bind
712706 -Wincomplete-record-updates
@@ -723,8 +717,10 @@ benchmark weigh-pandoc
723717test-suite test-pandoc
724718 type: exitcode-stdio-1.0
725719 main-is: test-pandoc.hs
726− hs-source-dirs: test
727− build-depends: base >= 4.8 && < 5,
720+ hs-source-dirs: test,
721+ prelude
722+ build-depends: base-noprelude >= 4.8 && < 5,
723+ base-compat >= 0.9,
728724 pandoc,
729725 pandoc-types >= 1.20 && < 1.21,
730726 mtl >= 2.2 && < 2.3,
@@ -750,11 +746,8 @@ test-suite test-pandoc
750746 xml >= 1.3.12 && < 1.4,
751747 doctemplates >= 0.8 && < 0.9,
752748 Glob >= 0.7 && < 0.11
753− if impl(ghc < 8.4)
754− hs-source-dirs: prelude
755− other-modules: Prelude
756− build-depends: base-compat >= 0.9
757− other-modules: Tests.Old
749+ other-modules: Prelude
750+ Tests.Old
758751 Tests.Command
759752 Tests.Helpers
760753 Tests.Lua
@@ -809,7 +802,6 @@ test-suite test-pandoc
809802 if os(windows)
810803 cpp-options: -D_WINDOWS
811804 default-language: Haskell2010
812− other-extensions: NoImplicitPrelude
813805 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
814806 -Wall -fno-warn-unused-do-bind
815807 -Wincomplete-record-updates
@@ -826,19 +818,17 @@ test-suite test-pandoc
826818benchmark benchmark-pandoc
827819 type: exitcode-stdio-1.0
828820 main-is: benchmark-pandoc.hs
829− hs-source-dirs: benchmark
821+ hs-source-dirs: benchmark,
822+ prelude
830823 build-depends: pandoc,
831824 time, bytestring, containers,
832− base >= 4.8 && < 5,
825+ base-noprelude >= 4.8 && < 5,
826+ base-compat >= 0.9,
833827 text >= 1.1.1.0 && < 1.3,
834828 mtl >= 2.2 && < 2.3,
835829 criterion >= 1.0 && < 1.6
836− if impl(ghc < 8.4)
837− hs-source-dirs: prelude
838− other-modules: Prelude
839− build-depends: base-compat >= 0.9
840830 default-language: Haskell2010
841− other-extensions: NoImplicitPrelude
831+ other-modules: Prelude
842832 ghc-options: -rtsopts -with-rtsopts=-K16m -threaded
843833 -Wall -fno-warn-unused-do-bind
844834 -Wincomplete-record-updates