git.iko.soy/typeable/pandoc
on master help sign in
Remove custom prelude and ghc 7.8 support.
commit0e16155aaf9d6df2c5dde07db5e385781280f8bd authorJohn MacFarlane <jgm@berkeley.edu> dateSun 14 Jan 2018, 23:31 (9 years ago) parenta1397ee
4 files changed+2−46
compare with master
unifiedsplit
.travis.yml−4 INSTALL.md+1−1 pandoc.cabal+1−25 prelude/Prelude.hs−16
.travis.yml−4
@@ -31,10 +31,6 @@ matrix:
3131 include:
3232 # We grab the appropriate GHC and cabal-install versions from hvr's PPA. See:
3333 # https://github.com/hvr/multi-ghc-travis
34− - env: BUILD=cabal GHCVER=7.8.4 CABALVER=1.18 OPTS="-O0 -Wall -fno-warn-unused-do-bind -Werror" FLAGS="fast embed_data_files" CABALARGS="--enable-benchmarks"
35− compiler: ": #GHC 7.8.4"
36− addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,happy-1.19.5], sources: [hvr-ghc]}}
37−
3834 # don't build benchmarks for ghc 7.10.3, because build takes too long...
3935 - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 OPTS="-O0 -Wall -fno-warn-unused-do-bind -Werror" FLAGS="fast embed_data_files" CABALARGS=""
4036 compiler: ": #GHC 7.10.3"
INSTALL.md+1−1
@@ -137,7 +137,7 @@ The easiest way to build pandoc from source is to use [stack]:
137137
1381381. Install the [Haskell platform]. This will give you [GHC] and
139139 the [cabal-install] build tool. Note that pandoc requires
140− GHC >= 7.8.
140+ GHC >= 7.10.
141141
1421422. Update your package database:
143143
pandoc.cabal+1−25
@@ -11,7 +11,7 @@ bug-reports: https://github.com/jgm/pandoc/issues
1111stability: alpha
1212homepage: http://pandoc.org
1313category: Text
14−tested-with: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2
14+tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2
1515synopsis: Conversion between markup formats
1616description: Pandoc is a Haskell library for converting from one markup
1717 format to another, and a command-line tool that uses
@@ -415,10 +415,6 @@ library
415415 RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
416416 FlexibleInstances
417417 hs-source-dirs: src
418− if impl(ghc < 7.10)
419− hs-source-dirs: prelude
420− other-modules: Prelude
421− build-depends: base-compat >= 0.9
422418
423419 exposed-modules: Text.Pandoc,
424420 Text.Pandoc.App,
@@ -560,10 +556,6 @@ executable pandoc
560556 RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
561557 FlexibleInstances
562558 hs-source-dirs: .
563− if impl(ghc < 7.10)
564− hs-source-dirs: prelude
565− other-modules: Prelude
566− build-depends: base-compat >= 0.9
567559 main-is: pandoc.hs
568560 buildable: True
569561 other-modules: Paths_pandoc
@@ -571,10 +563,6 @@ executable pandoc
571563executable trypandoc
572564 main-is: trypandoc.hs
573565 hs-source-dirs: trypandoc
574− if impl(ghc < 7.10)
575− hs-source-dirs: prelude
576− other-modules: Prelude
577− build-depends: base-compat >= 0.9
578566 default-language: Haskell2010
579567 if flag(trypandoc)
580568 build-depends: base, aeson, pandoc,
@@ -586,10 +574,6 @@ executable trypandoc
586574executable weigh-pandoc
587575 main-is: weigh-pandoc.hs
588576 hs-source-dirs: benchmark
589− if impl(ghc < 7.10)
590− hs-source-dirs: prelude
591− other-modules: Prelude
592− build-depends: base-compat >= 0.9
593577 if flag(weigh-pandoc)
594578 build-depends: pandoc,
595579 base >= 4.2 && < 5,
@@ -606,10 +590,6 @@ test-suite test-pandoc
606590 type: exitcode-stdio-1.0
607591 main-is: test-pandoc.hs
608592 hs-source-dirs: test
609− if impl(ghc < 7.10)
610− hs-source-dirs: prelude
611− other-modules: Prelude
612− build-depends: base-compat >= 0.9
613593 build-depends: base >= 4.2 && < 5,
614594 pandoc,
615595 pandoc-types >= 1.17.3 && < 1.18,
@@ -689,10 +669,6 @@ benchmark benchmark-pandoc
689669 type: exitcode-stdio-1.0
690670 main-is: benchmark-pandoc.hs
691671 hs-source-dirs: benchmark
692− if impl(ghc < 7.10)
693− hs-source-dirs: prelude
694− other-modules: Prelude
695− build-depends: base-compat >= 0.9
696672 build-depends: pandoc,
697673 time, bytestring, containers,
698674 base >= 4.2 && < 5,
prelude/Prelude.hsdeleted−16
@@ -1,16 +0,0 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2−{-# LANGUAGE PackageImports #-}
3−{-# LANGUAGE CPP #-}
4−
5−-- This custom Prelude emulates the API of the prelude
6−-- with base 4.8.
7−
8−module Prelude
9−(
10− module Prelude.Compat
11−, module Data.Monoid.Compat
12−)
13−where
14−
15−import Prelude.Compat
16−import Data.Monoid.Compat