From 28fb0936ce5f3db90a122255dfe1f3c74cfae3d7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Feb 21 2019 04:14:13 +0000 Subject: update to 0.14.1 --- diff --git a/.gitignore b/.gitignore index 9063419..a480bfa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /servant-0.12.1.tar.gz /servant-0.13.0.1.tar.gz /singleton-bool-0.1.4.tar.gz +/servant-0.14.1.tar.gz diff --git a/ghc-servant.spec b/ghc-servant.spec index 2f6a7cc..15ca936 100644 --- a/ghc-servant.spec +++ b/ghc-servant.spec @@ -10,9 +10,9 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.13.0.1 +Version: 0.14.1 # can only be reset when all subpkgs bumped -Release: 3%{?dist} +Release: 4%{?dist} Summary: A family of combinators for defining webservices APIs License: BSD @@ -147,6 +147,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %endif %changelog +* Thu Feb 21 2019 Jens Petersen - 0.14.1-4 +- update to 0.14.1 + * Sun Feb 17 2019 Jens Petersen - 0.13.0.1-3 - refresh to cabal-rpm-0.13 diff --git a/servant-0.13.0.1.cabal b/servant-0.13.0.1.cabal deleted file mode 100644 index fc83223..0000000 --- a/servant-0.13.0.1.cabal +++ /dev/null @@ -1,184 +0,0 @@ -name: servant -version: 0.13.0.1 -x-revision: 1 -synopsis: A family of combinators for defining webservices APIs -description: - A family of combinators for defining webservices APIs and serving them - . - You can learn about the basics in the . - . - -homepage: http://haskell-servant.readthedocs.org/ -Bug-reports: http://github.com/haskell-servant/servant/issues -license: BSD3 -license-file: LICENSE -author: Servant Contributors -maintainer: haskell-servant-maintainers@googlegroups.com -copyright: 2014-2016 Zalora South East Asia Pte Ltd, Servant Contributors -category: Servant, Web -build-type: Custom -cabal-version: >=1.10 -tested-with: - GHC==7.8.4, - GHC==7.10.3, - GHC==8.0.2, - GHC==8.2.2, - GHC==8.4.1 -extra-source-files: - include/*.h - CHANGELOG.md -source-repository head - type: git - location: http://github.com/haskell-servant/servant.git - -custom-setup - setup-depends: - base >= 4 && <5, - Cabal, - cabal-doctest >= 1.0.2 && <1.1 - -library - exposed-modules: - Servant.API - Servant.API.Alternative - Servant.API.BasicAuth - Servant.API.Capture - Servant.API.ContentTypes - Servant.API.Description - Servant.API.Empty - Servant.API.Experimental.Auth - Servant.API.Header - Servant.API.HttpVersion - Servant.API.Internal.Test.ComprehensiveAPI - Servant.API.IsSecure - Servant.API.Modifiers - Servant.API.QueryParam - Servant.API.Raw - Servant.API.RemoteHost - Servant.API.ReqBody - Servant.API.ResponseHeaders - Servant.API.Stream - Servant.API.Sub - Servant.API.TypeLevel - Servant.API.Vault - Servant.API.Verbs - Servant.API.WithNamedContext - Servant.Utils.Links - Servant.Utils.Enter - - -- Bundled with GHC: Lower bound to not force re-installs - -- text and mtl are bundled starting with GHC-8.4 - -- - -- note: mtl lower bound is so low because of GHC-7.8 - build-depends: - base >= 4.7 && < 4.12 - , bytestring >= 0.10.4.0 && < 0.11 - , mtl >= 2.1 && < 2.3 - , text >= 1.2.3.0 && < 1.3 - - if !impl(ghc >= 8.0) - build-depends: - semigroups >= 0.18.3 && < 0.19 - - -- Other dependencies: Lower bound around what is in the latest Stackage LTS. - -- Here can be exceptions if we really need features from the newer versions. - build-depends: - base-compat >= 0.9.3 && < 0.11 - , aeson >= 1.2.3.0 && < 1.5 - , attoparsec >= 0.13.2.0 && < 0.14 - , case-insensitive >= 1.2.0.10 && < 1.3 - , http-api-data >= 0.3.7.1 && < 0.4 - , http-media >= 0.7.0 && < 0.8 - , http-types >= 0.12 && < 0.13 - , natural-transformation >= 0.4 && < 0.5 - , mmorph >= 1.1.0 && < 1.2 - , tagged >= 0.8.5 && < 0.9 - , singleton-bool >= 0.1.2.0 && < 0.2 - , string-conversions >= 0.4.0.1 && < 0.5 - , network-uri >= 2.6.1.0 && < 2.7 - , vault >= 0.3.0.7 && < 0.4 - - hs-source-dirs: src - default-language: Haskell2010 - other-extensions: CPP - , ConstraintKinds - , DataKinds - , DeriveDataTypeable - , FlexibleInstances - , FunctionalDependencies - , GADTs - , KindSignatures - , MultiParamTypeClasses - , OverlappingInstances - , OverloadedStrings - , PolyKinds - , QuasiQuotes - , RecordWildCards - , ScopedTypeVariables - , TemplateHaskell - , TypeFamilies - , TypeOperators - , TypeSynonymInstances - , UndecidableInstances - ghc-options: -Wall - if impl(ghc >= 8.0) - ghc-options: -Wno-redundant-constraints - include-dirs: include - -test-suite spec - type: exitcode-stdio-1.0 - ghc-options: -Wall - default-language: Haskell2010 - hs-source-dirs: test - main-is: Spec.hs - other-modules: - Servant.API.ContentTypesSpec - Servant.API.ResponseHeadersSpec - Servant.Utils.LinksSpec - Servant.Utils.EnterSpec - - -- Dependencies inherited from the library. No need to specify bounds. - build-depends: - base - , base-compat - , aeson - , attoparsec - , bytestring - , servant - , string-conversions - , text - - if !impl(ghc >= 8.0) - build-depends: - semigroups - - -- Additonal dependencies - build-depends: - aeson-compat >= 0.3.3 && < 0.4 - , hspec >= 2.4.4 && < 2.6 - , QuickCheck >= 2.10.1 && < 2.12 - , quickcheck-instances >= 0.3.16 && < 0.4 - - build-tool-depends: - hspec-discover:hspec-discover >= 2.4.4 && < 2.6 - -test-suite doctests - build-depends: - base - , servant - , doctest >= 0.13.0 && <0.16 - - -- We test Links failure with doctest, so we need extra dependencies - build-depends: - hspec >= 2.4.4 && < 2.6 - - type: exitcode-stdio-1.0 - main-is: test/doctests.hs - buildable: True - default-language: Haskell2010 - ghc-options: -Wall -threaded - if impl(ghc >= 8.2) - x-doctest-options: -fdiagnostics-color=never - include-dirs: include - x-doctest-source-dirs: test - x-doctest-modules: Servant.Utils.LinksSpec diff --git a/servant-0.14.1.cabal b/servant-0.14.1.cabal new file mode 100644 index 0000000..282ebe9 --- /dev/null +++ b/servant-0.14.1.cabal @@ -0,0 +1,192 @@ +name: servant +version: 0.14.1 +x-revision: 1 + +synopsis: A family of combinators for defining webservices APIs +category: Servant, Web +description: + A family of combinators for defining webservices APIs and serving them + . + You can learn about the basics in the . + . + + +homepage: http://haskell-servant.readthedocs.org/ +Bug-reports: http://github.com/haskell-servant/servant/issues +license: BSD3 +license-file: LICENSE +author: Servant Contributors +maintainer: haskell-servant-maintainers@googlegroups.com +copyright: 2014-2016 Zalora South East Asia Pte Ltd, Servant Contributors +build-type: Custom +cabal-version: >=1.10 +tested-with: + GHC==7.8.4 + GHC==7.10.3 + GHC==8.0.2 + GHC==8.2.2 + GHC==8.4.4 + GHC==8.6.1 + +extra-source-files: + include/*.h + CHANGELOG.md +source-repository head + type: git + location: http://github.com/haskell-servant/servant.git + +custom-setup + setup-depends: + base >= 4 && <5, + Cabal, + cabal-doctest >= 1.0.6 && <1.1 + +library + exposed-modules: + Servant.API + Servant.API.Alternative + Servant.API.BasicAuth + Servant.API.Capture + Servant.API.ContentTypes + Servant.API.Description + Servant.API.Empty + Servant.API.Experimental.Auth + Servant.API.Generic + Servant.API.Header + Servant.API.HttpVersion + Servant.API.Internal.Test.ComprehensiveAPI + Servant.API.IsSecure + Servant.API.Modifiers + Servant.API.QueryParam + Servant.API.Raw + Servant.API.RemoteHost + Servant.API.ReqBody + Servant.API.ResponseHeaders + Servant.API.Stream + Servant.API.Sub + Servant.API.TypeLevel + Servant.API.Vault + Servant.API.Verbs + Servant.API.WithNamedContext + Servant.Links + + -- Deprecated modules, to be removed in late 2019 + exposed-modules: + Servant.Utils.Links + Servant.Utils.Enter + + -- Bundled with GHC: Lower bound to not force re-installs + -- text and mtl are bundled starting with GHC-8.4 + -- + -- note: mtl lower bound is so low because of GHC-7.8 + build-depends: + base >= 4.7 && < 4.13 + , bytestring >= 0.10.4.0 && < 0.11 + , mtl >= 2.1 && < 2.3 + , text >= 1.2.3.0 && < 1.3 + + if !impl(ghc >= 8.0) + build-depends: + semigroups >= 0.18.4 && < 0.19 + + -- Other dependencies: Lower bound around what is in the latest Stackage LTS. + -- Here can be exceptions if we really need features from the newer versions. + build-depends: + base-compat >= 0.10.1 && < 0.11 + , aeson >= 1.3.1.1 && < 1.5 + , attoparsec >= 0.13.2.2 && < 0.14 + , case-insensitive >= 1.2.0.10 && < 1.3 + , http-api-data >= 0.3.8.1 && < 0.4 + , http-media >= 0.7.1.2 && < 0.8 + , http-types >= 0.12.1 && < 0.13 + , natural-transformation >= 0.4 && < 0.5 + , mmorph >= 1.1.2 && < 1.2 + , tagged >= 0.8.5 && < 0.9 + , singleton-bool >= 0.1.4 && < 0.2 + , string-conversions >= 0.4.0.1 && < 0.5 + , network-uri >= 2.6.1.0 && < 2.7 + , vault >= 0.3.1.1 && < 0.4 + + hs-source-dirs: src + default-language: Haskell2010 + other-extensions: CPP + , ConstraintKinds + , DataKinds + , DeriveDataTypeable + , FlexibleInstances + , FunctionalDependencies + , GADTs + , KindSignatures + , MultiParamTypeClasses + , OverlappingInstances + , OverloadedStrings + , PolyKinds + , QuasiQuotes + , RecordWildCards + , ScopedTypeVariables + , TemplateHaskell + , TypeFamilies + , TypeOperators + , TypeSynonymInstances + , UndecidableInstances + ghc-options: -Wall + if impl(ghc >= 8.0) + ghc-options: -Wno-redundant-constraints + include-dirs: include + +test-suite spec + type: exitcode-stdio-1.0 + ghc-options: -Wall + default-language: Haskell2010 + hs-source-dirs: test + main-is: Spec.hs + other-modules: + Servant.API.ContentTypesSpec + Servant.API.ResponseHeadersSpec + Servant.Utils.EnterSpec + Servant.LinksSpec + + -- Dependencies inherited from the library. No need to specify bounds. + build-depends: + base + , base-compat + , aeson + , bytestring + , servant + , string-conversions + , text + + if !impl(ghc >= 8.0) + build-depends: + semigroups + + -- Additonal dependencies + build-depends: + aeson-compat >= 0.3.7.1 && < 0.4 + , hspec >= 2.5.1 && < 2.6 + , QuickCheck >= 2.11.3 && < 2.13 + , quickcheck-instances >= 0.3.18 && < 0.4 + + build-tool-depends: + hspec-discover:hspec-discover >= 2.5.1 && < 2.6 + +test-suite doctests + build-depends: + base + , servant + , doctest >= 0.15.0 && <0.17 + + -- We test Links failure with doctest, so we need extra dependencies + build-depends: + hspec >= 2.5.1 && < 2.6 + + type: exitcode-stdio-1.0 + main-is: test/doctests.hs + buildable: True + default-language: Haskell2010 + ghc-options: -Wall -threaded + if impl(ghc >= 8.2) + x-doctest-options: -fdiagnostics-color=never + include-dirs: include + x-doctest-source-dirs: test + x-doctest-modules: Servant.LinksSpec diff --git a/sources b/sources index 82b937e..f939447 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (singleton-bool-0.1.4.tar.gz) = 2aeb3117a9d02b8d9a212f9a9f1cad24657d6e2ab5ffe37da6880be6a67d9dae9403211acab4e75e3ad618d5f8c48d67457e00ee2830e9f4f140c44b40fd8ee5 -SHA512 (servant-0.13.0.1.tar.gz) = 3be9a97f2cc3d60cf3fc0f09aa3ee227f777dcb7e85e8579b1c169319f03dbb742fafa7dd1d4a1d20cdd04534cd327af3cbb04daf684ebdfc4e6e3a8c7b819d6 +SHA512 (servant-0.14.1.tar.gz) = a767a41c4682cfd3c52fca0c55862b9ce2d008fc388a44946621dbd67fa4d30b6f1d2c18642e410a58fadd2d26299bf67192a5def7f6d18afff18da284a44569