git.iko.soy/typeable/pandoc
on master help sign in
Cabal cleanup (#5693)

* pandoc.cabal: remove conditionals for ghc < 8.0. Support for GHC 7.10 has been dropped. * pandoc.cabal: compile with `-Wcpp-undef` when possible * pandoc.cabal: compile with `-fhide-source-paths` if possible

commitcd4b8f66bb81693433ae9d151b27d3dd540c18f4 authorAlbert Krewinkel <albert@zeitkraut.de> dateTue 27 Aug 2019, 02:04 (7 years ago) parentb446c6c
2 files changed+11−24
compare with master
unifiedsplit
cabal.project+2−2 pandoc.cabal+9−22
cabal.project+2−2
@@ -2,11 +2,11 @@ packages: pandoc.cabal
22
33package pandoc
44 flags: +embed_data_files -trypandoc
5− ghc-options: -Wall -fno-warn-unused-do-bind -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -Wincomplete-uni-patterns -Widentities -j +RTS -A32M -RTS
5+ ghc-options: -j +RTS -A32M -RTS
66
77package pandoc-citeproc
88 flags: +embed_data_files +bibutils -unicode_collation -test_citeproc -debug
9− ghc-options: -Wall -fno-warn-unused-do-bind -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -Wincomplete-uni-patterns -Widentities -j +RTS -A32M -RTS
9+ ghc-options: -j +RTS -A32M -RTS
1010
1111source-repository-package
1212 type: git
pandoc.cabal+9−22
@@ -423,13 +423,7 @@ library
423423 doclayout >= 0.1 && < 0.2,
424424 ipynb >= 0.1 && < 0.2,
425425 attoparsec >= 0.12 && < 0.14
426− if impl(ghc < 8.0)
427− build-depends: semigroups == 0.18.*,
428− -- basement 0.0.8 and foundation 0.0.21, transitive
429− -- dependencies, drop support for ghc 7.10.
430− basement < 0.0.8,
431− foundation < 0.0.21
432− if impl(ghc >= 8.0) && os(windows) && arch(i386)
426+ if os(windows) && arch(i386)
433427 build-depends: basement >= 0.0.10,
434428 foundation >= 0.0.23
435429 -- basement 0.0.9 won't build on 32-bit windows.
@@ -450,14 +444,17 @@ library
450444 if os(windows)
451445 cpp-options: -D_WINDOWS
452446 ghc-options: -Wall -fno-warn-unused-do-bind
453− if impl(ghc > 8.0)
454− ghc-options: -Wincomplete-record-updates
455− -Wnoncanonical-monad-instances
456− -Wnoncanonical-monadfail-instances
457− if impl(ghc > 8.4)
447+ -Wincomplete-record-updates
448+ -Wnoncanonical-monad-instances
449+ -Wnoncanonical-monadfail-instances
450+ if impl(ghc >= 8.2)
451+ ghc-options: -Wcpp-undef
452+ if impl(ghc >= 8.4)
458453 ghc-options: -Wincomplete-uni-patterns
459454 -Widentities
460455 -Werror=missing-home-modules
456+ -fhide-source-paths
457+
461458 default-language: Haskell2010
462459 other-extensions: NoImplicitPrelude
463460 hs-source-dirs: src
@@ -621,8 +618,6 @@ library
621618
622619executable pandoc
623620 build-depends: pandoc, base >= 4.8 && < 5
624− if impl(ghc < 8.0)
625− build-depends: semigroups == 0.18.*
626621 if impl(ghc < 8.4)
627622 hs-source-dirs: prelude
628623 other-modules: Prelude
@@ -648,8 +643,6 @@ executable trypandoc
648643 buildable: True
649644 else
650645 buildable: False
651− if impl(ghc < 8.0)
652− build-depends: semigroups == 0.18.*
653646 if impl(ghc < 8.4)
654647 hs-source-dirs: prelude
655648 other-modules: Prelude
@@ -664,8 +657,6 @@ benchmark weigh-pandoc
664657 text,
665658 weigh >= 0.0 && < 0.1,
666659 mtl >= 2.2 && < 2.3
667− if impl(ghc < 8.0)
668− build-depends: semigroups == 0.18.*
669660 if impl(ghc < 8.4)
670661 hs-source-dirs: prelude
671662 other-modules: Prelude
@@ -703,8 +694,6 @@ test-suite test-pandoc
703694 zip-archive >= 0.2.3.4 && < 0.5,
704695 xml >= 1.3.12 && < 1.4,
705696 Glob >= 0.7 && < 0.11
706− if impl(ghc < 8.0)
707− build-depends: semigroups == 0.18.*
708697 if impl(ghc < 8.4)
709698 hs-source-dirs: prelude
710699 other-modules: Prelude
@@ -776,8 +765,6 @@ benchmark benchmark-pandoc
776765 text >= 1.1.1.0 && < 1.3,
777766 mtl >= 2.2 && < 2.3,
778767 criterion >= 1.0 && < 1.6
779− if impl(ghc < 8.0)
780− build-depends: semigroups == 0.18.*
781768 if impl(ghc < 8.4)
782769 hs-source-dirs: prelude
783770 other-modules: Prelude