diff --git a/barecheck.cabal b/barecheck.cabal --- a/barecheck.cabal +++ b/barecheck.cabal @@ -3,14 +3,15 @@ -- http://www.github.com/massysett/cartel -- -- Script name used to generate: genCabal.hs --- Generated on: 2014-11-23 21:54:12.299126 EST --- Cartel library version: 0.10.0.2 +-- Generated on: 2015-03-19 23:04:45.376649 EDT +-- Cartel library version: 0.14.2.0 + name: barecheck -version: 0.2.0.6 +version: 0.2.0.8 cabal-version: >= 1.14 -build-type: Simple license: BSD3 license-file: LICENSE +build-type: Simple copyright: Copyright 2014 Omari Norman author: Omari Norman, omari@smileystation.com maintainer: Omari Norman, omari@smileystation.com @@ -37,66 +38,49 @@ modules provided in this package and with other standard modules, so keep this in mind when you do your imports. category: Testing -tested-with: GHC == 7.4.1, GHC == 7.6.3, GHC == 7.8.3 +tested-with: + GHC == 7.6.3 + GHC == 7.8.3 extra-source-files: - minimum-versions.txt - , current-versions.txt - , genCabal.hs - , sunlight-test.hs - , oldQuickCheck/Barecheck/Promote.hs - , lib/Barecheck/Promote.hs - -source-repository head - type: git - location: http://github.com/massysett/barecheck.git - -Flag oldQuickCheck - Description: Use QuickCheck 2.6 - Default: False - Manual: False + genCabal.hs Library exposed-modules: - Barecheck.Promote - , Barecheck.Util - , Data.Map.Coarbitrary - , Data.Map.Generators - , Data.Map.Shrinkers - , Data.Monoid.Coarbitrary - , Data.Monoid.Generators - , Data.Monoid.Shrinkers - , Data.Sequence.Coarbitrary - , Data.Sequence.Generators - , Data.Sequence.Shrinkers - , Data.Text.Coarbitrary - , Data.Text.Generators - , Data.Text.Shrinkers - , Data.Time.Coarbitrary - , Data.Time.Generators - , Data.Time.Shrinkers - , Data.Tree.Coarbitrary - , Data.Tree.Generators - , Data.Tree.Shrinkers - , Prelude.Coarbitrary - , Prelude.Generators - , Prelude.Shrinkers + Barecheck.Promote + Barecheck.Util + Data.Map.Coarbitrary + Data.Map.Generators + Data.Map.Shrinkers + Data.Monoid.Coarbitrary + Data.Monoid.Generators + Data.Monoid.Shrinkers + Data.Sequence.Coarbitrary + Data.Sequence.Generators + Data.Sequence.Shrinkers + Data.Text.Coarbitrary + Data.Text.Generators + Data.Text.Shrinkers + Data.Time.Coarbitrary + Data.Time.Generators + Data.Time.Shrinkers + Data.Tree.Coarbitrary + Data.Tree.Generators + Data.Tree.Shrinkers + Prelude.Coarbitrary + Prelude.Generators + Prelude.Shrinkers build-depends: - QuickCheck ((> 2.6 || == 2.6) && < 2.8) - , base ((> 4.5.0.0 || == 4.5.0.0) && < 4.8.0.0) - , text ((> 0.11.3.1 || == 0.11.3.1) && < 1.3) - , containers ((> 0.4.2.1 || == 0.4.2.1) && < 0.6) - , time ((> 1.4 || == 1.4) && < 1.6) - if flag(oldQuickCheck) - hs-source-dirs: - oldQuickCheck - , lib - build-depends: - QuickCheck ((> 2.6 || == 2.6) && < 2.7) - else - hs-source-dirs: - lib - build-depends: - QuickCheck ((> 2.7 || == 2.7) && < 2.8) + QuickCheck >= 2.7 && < 2.9 + , base >= 4.5.0.0 && < 4.8.0.0 + , text >= 0.11.3.1 && < 1.3 + , containers >= 0.4.2.1 && < 0.6 + , time >= 1.4 && < 1.6 ghc-options: - -Wall + -Wall default-language: Haskell2010 + hs-source-dirs: + lib + +source-repository head + type: git + location: https://github.com/massysett/barecheck.git diff --git a/current-versions.txt b/current-versions.txt deleted file mode 100644 --- a/current-versions.txt +++ /dev/null @@ -1,46 +0,0 @@ -This package was tested to work with these dependency -versions and compiler version. -These are the default versions fetched by cabal install. -Tested as of: 2014-08-11 21:47:39.133617 UTC -Path to compiler: ghc-7.8.3 -Compiler description: 7.8.3 - -/opt/ghc/7.8.3/lib/ghc-7.8.3/package.conf.d: - Cabal-1.18.1.3 - array-0.5.0.0 - base-4.7.0.1 - bin-package-db-0.0.0.0 - binary-0.7.1.0 - rts-1.0 - bytestring-0.10.4.0 - containers-0.5.5.1 - deepseq-1.3.0.2 - directory-1.2.1.0 - filepath-1.3.0.2 - (ghc-7.8.3) - ghc-prim-0.3.1.0 - haskeline-0.7.1.2 - (haskell2010-1.1.2.0) - (haskell98-2.0.0.3) - hoopl-3.10.0.1 - hpc-0.6.0.1 - integer-gmp-0.5.1.0 - old-locale-1.0.0.6 - old-time-1.1.0.2 - pretty-1.1.1.1 - process-1.2.0.0 - template-haskell-2.9.0.0 - terminfo-0.4.0.0 - time-1.4.2 - transformers-0.3.0.0 - unix-2.7.0.1 - xhtml-3000.2.1 - -/home/massysett/barecheck/sunlight-32666/db: - QuickCheck-2.7.6 - barecheck-0.2.0.0 - primitive-0.5.3.0 - random-1.0.1.1 - text-1.1.1.3 - tf-random-0.5 - diff --git a/genCabal.hs b/genCabal.hs --- a/genCabal.hs +++ b/genCabal.hs @@ -1,34 +1,31 @@ -- Generates the Cabal file using Cartel. --- Written for Cartel version 0.10.0.2 +-- Written for Cartel version 0.14-series. -- Cartel is available at -- http://github.com/massysett/cartel module Main where -import qualified Cartel as A - -versionInts :: [Int] -versionInts = [0,2,0,6] +import Cartel -version :: A.Version -version = A.Version versionInts +versionInts :: [Word] +versionInts = [0,2,0,8] -properties :: A.Properties -properties = A.empty - { A.prName = "barecheck" - , A.prVersion = version - , A.prCabalVersion = (1,14) - , A.prBuildType = A.Simple - , A.prLicense = A.BSD3 - , A.prLicenseFile = "LICENSE" - , A.prCopyright = "Copyright 2014 Omari Norman" - , A.prAuthor = "Omari Norman, omari@smileystation.com" - , A.prMaintainer = "Omari Norman, omari@smileystation.com" - , A.prStability = "Experimental" - , A.prHomepage = "http://github.com/massysett/barecheck" - , A.prBugReports = "http://github.com/massysett/barecheck/issues" - , A.prSynopsis = "QuickCheck implementations for common types" - , A.prDescription = +properties :: Properties +properties = blank + { name = "barecheck" + , version = versionInts + , cabalVersion = Just (1,14) + , buildType = Just simple + , license = Just bsd3 + , licenseFile = "LICENSE" + , copyright = "Copyright 2014 Omari Norman" + , author = "Omari Norman, omari@smileystation.com" + , maintainer = "Omari Norman, omari@smileystation.com" + , stability = "Experimental" + , homepage = "http://github.com/massysett/barecheck" + , bugReports = "http://github.com/massysett/barecheck/issues" + , synopsis = "QuickCheck implementations for common types" + , description = [ "Provides QuickCheck implementations for common types distributed" , "with GHC and in the Haskell Platform. The implementations" , "are NOT provided through the QuickCheck Arbitrary and" @@ -47,88 +44,47 @@ , "modules provided in this package and with other standard" , "modules, so keep this in mind when you do your imports." ] - , A.prCategory = "Testing" - , A.prTestedWith = - let ghc ints = (A.GHC, A.eq ints) - in map ghc [[7,4,1], [7,6,3], [7,8,3]] - , A.prExtraSourceFiles = - [ "minimum-versions.txt" - , "current-versions.txt" - , "genCabal.hs" - , "sunlight-test.hs" - - -- Must specify all conditional modules for distribution - , "oldQuickCheck/Barecheck/Promote.hs" - , "lib/Barecheck/Promote.hs" + , category = "Testing" + , testedWith = + let mkGhc ints = (ghc, eq ints) + in map mkGhc [[7,6,3], [7,8,3]] + , extraSourceFiles = + [ "genCabal.hs" ] } -repo :: A.Repository -repo = A.empty - { A.repoVcs = A.Git - , A.repoKind = A.Head - , A.repoLocation = "http://github.com/massysett/barecheck.git" - } - -quickcheck :: A.Package -quickcheck = A.closedOpen "QuickCheck" [2,6] [2,8] - -base :: A.Package -base = A.closedOpen "base" [4,5,0,0] [4,8,0,0] - -text :: A.Package -text = A.closedOpen "text" [0,11,3,1] [1,3] - -containers :: A.Package -containers = A.closedOpen "containers" [0,4,2,1] [0,6] +quickcheck :: Package +quickcheck = closedOpen "QuickCheck" [2,7] [2,9] -time :: A.Package -time = A.closedOpen "time" [1,4] [1,6] +base :: Package +base = closedOpen "base" [4,5,0,0] [4,8,0,0] -oldQuickCheck :: A.Flag -oldQuickCheck = A.Flag - { A.flName = "oldQuickCheck" - , A.flDescription = "Use QuickCheck 2.6" - , A.flDefault = False - , A.flManual = False - } +text :: Package +text = closedOpen "text" [0,11,3,1] [1,3] -library - :: [String] - -- ^ Library modules - -> A.Library -library ms = A.Library - [ A.LibExposedModules ms - , A.buildDepends - [ quickcheck - , base - , text - , containers - , time - ] - , A.cif (A.flag "oldQuickCheck") - [ A.hsSourceDirs [ "oldQuickCheck", "lib" ] - , A.buildDepends [ A.closedOpen "QuickCheck" [2,6] [2,7] ] - ] - [ A.hsSourceDirs [ "lib" ] - , A.buildDepends [ A.closedOpen "QuickCheck" [2,7] [2,8] ] - ] - , A.ghcOptions [ "-Wall" ] - , A.defaultLanguage A.Haskell2010 - ] +containers :: Package +containers = closedOpen "containers" [0,4,2,1] [0,6] -cabal - :: [String] - -- ^ Library modules - -> A.Cabal -cabal ms = A.empty - { A.cProperties = properties - , A.cRepositories = [repo] - , A.cFlags = [ oldQuickCheck ] - , A.cLibrary = Just $ library ms - } +time :: Package +time = closedOpen "time" [1,4] [1,6] main :: IO () -main = do - ms <- A.modules "lib" - A.render "genCabal.hs" $ cabal ms +main = defaultMain $ do + libMods <- modules "lib" + return + ( properties + , [ exposedModules libMods + , buildDepends + [ quickcheck + , base + , text + , containers + , time + ] + , ghcOptions ["-Wall"] + , haskell2010 + , hsSourceDirs ["lib"] + ] + , [ githubHead "massysett" "barecheck" + ] + ) diff --git a/minimum-versions.txt b/minimum-versions.txt deleted file mode 100644 --- a/minimum-versions.txt +++ /dev/null @@ -1,43 +0,0 @@ -This package was tested to work with these dependency -versions and compiler version. -These are the minimum versions given in the .cabal file. -Tested as of: 2014-08-11 21:47:39.133617 UTC -Path to compiler: ghc-7.4.1 -Compiler description: 7.4.1 - -/opt/ghc/7.4.1/lib/ghc-7.4.1/package.conf.d: - Cabal-1.14.0 - array-0.4.0.0 - base-4.5.0.0 - bin-package-db-0.0.0.0 - binary-0.5.1.0 - bytestring-0.9.2.1 - containers-0.4.2.1 - deepseq-1.3.0.0 - directory-1.1.0.2 - extensible-exceptions-0.1.1.4 - filepath-1.3.0.0 - (ghc-7.4.1) - ghc-prim-0.2.0.0 - (haskell2010-1.1.0.1) - (haskell98-2.0.0.1) - hoopl-3.8.7.3 - hpc-0.5.1.1 - integer-gmp-0.4.0.0 - old-locale-1.0.0.4 - old-time-1.1.0.0 - pretty-1.1.1.0 - process-1.1.0.1 - rts-1.0 - template-haskell-2.7.0.0 - time-1.4 - unix-2.5.1.0 - -/home/massysett/barecheck/sunlight-32666/db: - QuickCheck-2.7 - barecheck-0.2.0.0 - primitive-0.5.3.0 - random-1.0.1.1 - text-0.11.3.1 - tf-random-0.5 - diff --git a/oldQuickCheck/Barecheck/Promote.hs b/oldQuickCheck/Barecheck/Promote.hs deleted file mode 100644 --- a/oldQuickCheck/Barecheck/Promote.hs +++ /dev/null @@ -1,8 +0,0 @@ --- | This module allows for the 'promote' function to be imported --- correctly from different QuickCheck versions. QuickCheck 2.6 used --- Test.QuickCheck.Gen.promote; QuickCheck 2.7 uses --- Test.QuickCheck.Gen.Unsafe.promote. - -module Barecheck.Promote (promote) where - -import Test.QuickCheck.Gen (promote) diff --git a/sunlight-test.hs b/sunlight-test.hs deleted file mode 100644 --- a/sunlight-test.hs +++ /dev/null @@ -1,15 +0,0 @@ -module Main where - -import Test.Sunlight - -inputs = TestInputs - { tiDescription = Nothing - , tiCabal = "cabal" - , tiLowest = ("7.4.1", "ghc-7.4.1", "ghc-pkg-7.4.1") - , tiDefault = [ ("7.4.1", "ghc-7.4.1", "ghc-pkg-7.4.1") - , ("7.6.3", "ghc-7.6.3", "ghc-pkg-7.6.3") - , ("7.8.3", "ghc-7.8.3", "ghc-pkg-7.8.3") ] - , tiTest = [] - } - -main = runTests inputs