src/OptionalConfiguration.hs: use an explicit mappend.

[mailbox-count.git] / mailbox-count.cabal

diff --git a/mailbox-count.cabal b/mailbox-count.cabal
index 331d98b1fad55fec1d36302340c7196792c61ced..4852d92fa590e9e234b63faa98e6852604e8ca6b 100644 (file)
--- a/mailbox-count.cabal
+++ b/mailbox-count.cabal
@@ -1,9 +1,9 @@
 name:           mailbox-count
-version:        0.0.2
+version:        0.0.4
 cabal-version:  >= 1.8
 author:         Michael Orlitzky
 maintainer:    Michael Orlitzky <michael@orlitzky.com>
-license:        GPL-3
+license:        AGPL-3
 license-file:   doc/LICENSE
 bug-reports:    mailto:michael@orlitzky.com
 category:       Mail, Utils
@@ -153,7 +153,7 @@ description:
 
 executable mailbox-count
   build-depends:
-    base                        >= 4.6 && < 5,
+    base                        >= 4.8 && < 5,
     cmdargs                     >= 0.10,
     configurator                >= 0.2,
     containers                  >= 0.5,
@@ -165,6 +165,11 @@ executable mailbox-count
     MissingH                    >= 1.2,
     tasty                       >= 0.8,
     tasty-hunit                 >= 0.8
+  -- Data.Semigroup was added to GHC.Base in ghc-8.0
+  if impl(ghc < 8.0)
+     -- The minor version 0.18.2 deleted the entire API?
+     build-depends: semigroups < 0.18.2
+
   main-is:
     Main.hs
 
@@ -175,31 +180,31 @@ executable mailbox-count
     Configuration
     CommandLine
     OptionalConfiguration
+    -- WARNING: the Paths_mailbox_count module is automatically generated by
+    -- Cabal itself. We don't want it included in the release tarballs,
+    -- since we typically want the paths that the user has configured.
+    -- Nevertheless, Cabal will complain if we don't include it here.
+    Paths_mailbox_count
     Report
 
-  ghc-options:
-    -Wall
-    -fwarn-hi-shadowing
-    -fwarn-missing-signatures
-    -fwarn-name-shadowing
-    -fwarn-orphans
-    -fwarn-type-defaults
-    -fwarn-tabs
-    -fwarn-incomplete-record-updates
-    -fwarn-monomorphism-restriction
-    -fwarn-unused-do-bind
-    -rtsopts
-    -threaded
-    -optc-O3
-    -optc-march=native
-
 
 test-suite testsuite
   type: exitcode-stdio-1.0
   hs-source-dirs: src test
   main-is: TestSuite.hs
+
+  other-modules:
+    Configuration
+    OptionalConfiguration
+    -- WARNING: the Paths_mailbox_count module is automatically generated by
+    -- Cabal itself. We don't want it included in the release tarballs,
+    -- since we typically want the paths that the user has configured.
+    -- Nevertheless, Cabal will complain if we don't include it here.
+    Paths_mailbox_count
+    Report
+
   build-depends:
-    base                        >= 4.6 && < 5,
+    base                        >= 4.8 && < 5,
     cmdargs                     >= 0.10,
     configurator                >= 0.2,
     containers                  >= 0.5,
@@ -211,20 +216,10 @@ test-suite testsuite
     MissingH                    >= 1.2,
     tasty                       >= 0.8,
     tasty-hunit                 >= 0.8
-
-  -- It's not entirely clear to me why I have to reproduce all of this.
-  ghc-options:
-    -Wall
-    -fwarn-hi-shadowing
-    -fwarn-missing-signatures
-    -fwarn-name-shadowing
-    -fwarn-orphans
-    -fwarn-type-defaults
-    -fwarn-tabs
-    -fwarn-incomplete-record-updates
-    -fwarn-monomorphism-restriction
-    -fwarn-unused-do-bind
-    -O2
+  -- Data.Semigroup was added to GHC.Base in ghc-8.0
+  if impl(ghc < 8.0)
+     -- The minor version 0.18.2 deleted the entire API?
+     build-depends: semigroups < 0.18.2
 
 
 test-suite doctests
@@ -232,30 +227,14 @@ test-suite doctests
   hs-source-dirs: test
   main-is: Doctests.hs
   build-depends:
-    base      >= 4.6 && < 5,
+    base      >= 4.8 && < 5,
     -- Additional test dependencies.
     doctest   >= 0.9,
     filemanip >= 0.3.6
 
-  -- It's not entirely clear to me why I have to reproduce all of this.
-  ghc-options:
-    -Wall
-    -fwarn-hi-shadowing
-    -fwarn-missing-signatures
-    -fwarn-name-shadowing
-    -fwarn-orphans
-    -fwarn-type-defaults
-    -fwarn-tabs
-    -fwarn-incomplete-record-updates
-    -fwarn-monomorphism-restriction
-    -fwarn-unused-do-bind
-    -rtsopts
-    -threaded
-    -optc-O3
-    -optc-march=native
 
 
 source-repository head
   type: git
-  location: http://michael.orlitzky.com/git/mailbox-count.git
+  location: http://gitweb.michael.orlitzky.com/mailbox-count.git
   branch: master