git.iko.soy/typeable/pandoc
on master help sign in
Cabal cleanup (#5693)
cd4b8f6Albert Krewinkel
cabal.project+2−2
compare with master
unifiedsplit
@@ -2,11 +2,11 @@ packages: pandoc.cabal
2
2
3package pandoc
3package pandoc
4 flags: +embed_data_files -trypandoc
4 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
6
6
7package pandoc-citeproc
7package pandoc-citeproc
8 flags: +embed_data_files +bibutils -unicode_collation -test_citeproc -debug
8 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
10
10
11source-repository-package
11source-repository-package
12 type: git
12 type: git
pandoc.cabal+9−22
@@ -423,13 +423,7 @@ library
423 doclayout >= 0.1 && < 0.2,
423 doclayout >= 0.1 && < 0.2,
424 ipynb >= 0.1 && < 0.2,
424 ipynb >= 0.1 && < 0.2,
425 attoparsec >= 0.12 && < 0.14
425 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)
433 build-depends: basement >= 0.0.10,
427 build-depends: basement >= 0.0.10,
434 foundation >= 0.0.23
428 foundation >= 0.0.23
435 -- basement 0.0.9 won't build on 32-bit windows.
429 -- basement 0.0.9 won't build on 32-bit windows.
@@ -450,14 +444,17 @@ library
450 if os(windows)
444 if os(windows)
451 cpp-options: -D_WINDOWS
445 cpp-options: -D_WINDOWS
452 ghc-options: -Wall -fno-warn-unused-do-bind
446 ghc-options: -Wall -fno-warn-unused-do-bind
453− if impl(ghc > 8.0)
454− ghc-options: -Wincomplete-record-updates
447+ -Wincomplete-record-updates
455− -Wnoncanonical-monad-instances
448+ -Wnoncanonical-monad-instances
456− -Wnoncanonical-monadfail-instances
449+ -Wnoncanonical-monadfail-instances
457− if impl(ghc > 8.4)
450+ if impl(ghc >= 8.2)
451+ ghc-options: -Wcpp-undef
452+ if impl(ghc >= 8.4)
458 ghc-options: -Wincomplete-uni-patterns
453 ghc-options: -Wincomplete-uni-patterns
459 -Widentities
454 -Widentities
460 -Werror=missing-home-modules
455 -Werror=missing-home-modules
456+ -fhide-source-paths
457+
461 default-language: Haskell2010
458 default-language: Haskell2010
462 other-extensions: NoImplicitPrelude
459 other-extensions: NoImplicitPrelude
463 hs-source-dirs: src
460 hs-source-dirs: src
@@ -621,8 +618,6 @@ library
621
618
622executable pandoc
619executable pandoc
623 build-depends: pandoc, base >= 4.8 && < 5
620 build-depends: pandoc, base >= 4.8 && < 5
624− if impl(ghc < 8.0)
625− build-depends: semigroups == 0.18.*
626 if impl(ghc < 8.4)
621 if impl(ghc < 8.4)
627 hs-source-dirs: prelude
622 hs-source-dirs: prelude
628 other-modules: Prelude
623 other-modules: Prelude
@@ -648,8 +643,6 @@ executable trypandoc
648 buildable: True
643 buildable: True
649 else
644 else
650 buildable: False
645 buildable: False
651− if impl(ghc < 8.0)
652− build-depends: semigroups == 0.18.*
653 if impl(ghc < 8.4)
646 if impl(ghc < 8.4)
654 hs-source-dirs: prelude
647 hs-source-dirs: prelude
655 other-modules: Prelude
648 other-modules: Prelude
@@ -664,8 +657,6 @@ benchmark weigh-pandoc
664 text,
657 text,
665 weigh >= 0.0 && < 0.1,
658 weigh >= 0.0 && < 0.1,
666 mtl >= 2.2 && < 2.3
659 mtl >= 2.2 && < 2.3
667− if impl(ghc < 8.0)
668− build-depends: semigroups == 0.18.*
669 if impl(ghc < 8.4)
660 if impl(ghc < 8.4)
670 hs-source-dirs: prelude
661 hs-source-dirs: prelude
671 other-modules: Prelude
662 other-modules: Prelude
@@ -703,8 +694,6 @@ test-suite test-pandoc
703 zip-archive >= 0.2.3.4 && < 0.5,
694 zip-archive >= 0.2.3.4 && < 0.5,
704 xml >= 1.3.12 && < 1.4,
695 xml >= 1.3.12 && < 1.4,
705 Glob >= 0.7 && < 0.11
696 Glob >= 0.7 && < 0.11
706− if impl(ghc < 8.0)
707− build-depends: semigroups == 0.18.*
708 if impl(ghc < 8.4)
697 if impl(ghc < 8.4)
709 hs-source-dirs: prelude
698 hs-source-dirs: prelude
710 other-modules: Prelude
699 other-modules: Prelude
@@ -776,8 +765,6 @@ benchmark benchmark-pandoc
776 text >= 1.1.1.0 && < 1.3,
765 text >= 1.1.1.0 && < 1.3,
777 mtl >= 2.2 && < 2.3,
766 mtl >= 2.2 && < 2.3,
778 criterion >= 1.0 && < 1.6
767 criterion >= 1.0 && < 1.6
779− if impl(ghc < 8.0)
780− build-depends: semigroups == 0.18.*
781 if impl(ghc < 8.4)
768 if impl(ghc < 8.4)
782 hs-source-dirs: prelude
769 hs-source-dirs: prelude
783 other-modules: Prelude
770 other-modules: Prelude