From 0e16155aaf9d6df2c5dde07db5e385781280f8bd Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 14 Jan 2018 23:31:14 -0800
Subject: Remove custom prelude and ghc 7.8 support.
---
.travis.yml | 4 ----
INSTALL.md | 2 +-
pandoc.cabal | 26 +-------------------------
prelude/Prelude.hs | 16 ----------------
4 files changed, 2 insertions(+), 46 deletions(-)
delete mode 100644 prelude/Prelude.hs
diff --git a/.travis.yml b/.travis.yml
index bb97802ac..06ce6e0a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,10 +31,6 @@ matrix:
include:
# We grab the appropriate GHC and cabal-install versions from hvr's PPA. See:
# https://github.com/hvr/multi-ghc-travis
- - 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"
- compiler: ": #GHC 7.8.4"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,happy-1.19.5], sources: [hvr-ghc]}}
-
# don't build benchmarks for ghc 7.10.3, because build takes too long...
- 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=""
compiler: ": #GHC 7.10.3"
diff --git a/INSTALL.md b/INSTALL.md
index aae630838..c8f734bea 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -137,7 +137,7 @@ The easiest way to build pandoc from source is to use [stack]:
1. Install the [Haskell platform]. This will give you [GHC] and
the [cabal-install] build tool. Note that pandoc requires
- GHC >= 7.8.
+ GHC >= 7.10.
2. Update your package database:
diff --git a/pandoc.cabal b/pandoc.cabal
index 4c8a9a45a..302d0700c 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -11,7 +11,7 @@ bug-reports: https://github.com/jgm/pandoc/issues
stability: alpha
homepage: http://pandoc.org
category: Text
-tested-with: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2
+tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2
synopsis: Conversion between markup formats
description: Pandoc is a Haskell library for converting from one markup
format to another, and a command-line tool that uses
@@ -415,10 +415,6 @@ library
RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
FlexibleInstances
hs-source-dirs: src
- if impl(ghc < 7.10)
- hs-source-dirs: prelude
- other-modules: Prelude
- build-depends: base-compat >= 0.9
exposed-modules: Text.Pandoc,
Text.Pandoc.App,
@@ -560,10 +556,6 @@ executable pandoc
RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
FlexibleInstances
hs-source-dirs: .
- if impl(ghc < 7.10)
- hs-source-dirs: prelude
- other-modules: Prelude
- build-depends: base-compat >= 0.9
main-is: pandoc.hs
buildable: True
other-modules: Paths_pandoc
@@ -571,10 +563,6 @@ executable pandoc
executable trypandoc
main-is: trypandoc.hs
hs-source-dirs: trypandoc
- if impl(ghc < 7.10)
- hs-source-dirs: prelude
- other-modules: Prelude
- build-depends: base-compat >= 0.9
default-language: Haskell2010
if flag(trypandoc)
build-depends: base, aeson, pandoc,
@@ -586,10 +574,6 @@ executable trypandoc
executable weigh-pandoc
main-is: weigh-pandoc.hs
hs-source-dirs: benchmark
- if impl(ghc < 7.10)
- hs-source-dirs: prelude
- other-modules: Prelude
- build-depends: base-compat >= 0.9
if flag(weigh-pandoc)
build-depends: pandoc,
base >= 4.2 && < 5,
@@ -606,10 +590,6 @@ test-suite test-pandoc
type: exitcode-stdio-1.0
main-is: test-pandoc.hs
hs-source-dirs: test
- if impl(ghc < 7.10)
- hs-source-dirs: prelude
- other-modules: Prelude
- build-depends: base-compat >= 0.9
build-depends: base >= 4.2 && < 5,
pandoc,
pandoc-types >= 1.17.3 && < 1.18,
@@ -689,10 +669,6 @@ benchmark benchmark-pandoc
type: exitcode-stdio-1.0
main-is: benchmark-pandoc.hs
hs-source-dirs: benchmark
- if impl(ghc < 7.10)
- hs-source-dirs: prelude
- other-modules: Prelude
- build-depends: base-compat >= 0.9
build-depends: pandoc,
time, bytestring, containers,
base >= 4.2 && < 5,
diff --git a/prelude/Prelude.hs b/prelude/Prelude.hs
deleted file mode 100644
index 98185b57a..000000000
--- a/prelude/Prelude.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE PackageImports #-}
-{-# LANGUAGE CPP #-}
-
--- This custom Prelude emulates the API of the prelude
--- with base 4.8.
-
-module Prelude
-(
- module Prelude.Compat
-, module Data.Monoid.Compat
-)
-where
-
-import Prelude.Compat
-import Data.Monoid.Compat
--
cgit v1.2.3