Hello community, here is the log from the commit of package ghc-swagger2 for openSUSE:Factory checked in at 2017-07-23 12:15:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-swagger2 (Old) and /work/SRC/openSUSE:Factory/.ghc-swagger2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-swagger2" Sun Jul 23 12:15:12 2017 rev:5 rq:511922 version:2.1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-swagger2/ghc-swagger2.changes 2017-06-04 01:55:29.296994991 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-swagger2.new/ghc-swagger2.changes 2017-07-23 12:15:16.152376742 +0200 @@ -1,0 +2,5 @@ +Mon Jul 17 03:01:31 UTC 2017 - [email protected] + +- Update to version 2.1.4.1. + +------------------------------------------------------------------- Old: ---- swagger2-2.1.4.tar.gz swagger2.cabal New: ---- swagger2-2.1.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-swagger2.spec ++++++ --- /var/tmp/diff_new_pack.A5KUkD/_old 2017-07-23 12:15:17.180231551 +0200 +++ /var/tmp/diff_new_pack.A5KUkD/_new 2017-07-23 12:15:17.180231551 +0200 @@ -19,18 +19,18 @@ %global pkg_name swagger2 %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.1.4 +Version: 2.1.4.1 Release: 0 Summary: Swagger 2.0 data model License: BSD-3-Clause Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-base-compat-devel BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-cabal-doctest-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-generics-sop-devel BuildRequires: ghc-hashable-devel @@ -60,7 +60,11 @@ %endif %description -Swagger 2.0 data model. +This library is inteded to be used for decoding and encoding Swagger 2.0 API +specifications as well as manipulating them. + +The original Swagger 2.0 specification is available at +http://swagger.io/specification/. %package devel Summary: Haskell %{pkg_name} library development files @@ -75,7 +79,6 @@ %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ swagger2-2.1.4.tar.gz -> swagger2-2.1.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swagger2-2.1.4/CHANGELOG.md new/swagger2-2.1.4.1/CHANGELOG.md --- old/swagger2-2.1.4/CHANGELOG.md 2017-04-25 21:08:54.000000000 +0200 +++ new/swagger2-2.1.4.1/CHANGELOG.md 2017-07-14 19:49:53.000000000 +0200 @@ -1,3 +1,9 @@ +2.1.4.1 +------- + +* GHC-8.2 support (see [#95](https://github.com/GetShopTV/swagger2/issues/95)) +* Documentation corrections (see [#105](https://github.com/GetShopTV/swagger2/pull/105)) + 2.1.4 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swagger2-2.1.4/Setup.hs new/swagger2-2.1.4.1/Setup.hs --- old/swagger2-2.1.4/Setup.hs 2015-11-06 13:37:58.000000000 +0100 +++ new/swagger2-2.1.4.1/Setup.hs 2017-07-14 19:49:53.000000000 +0200 @@ -1,2 +1,33 @@ +{-# LANGUAGE CPP #-} +{-# OPTIONS_GHC -Wall #-} +module Main (main) where + +#ifndef MIN_VERSION_cabal_doctest +#define MIN_VERSION_cabal_doctest(x,y,z) 0 +#endif + +#if MIN_VERSION_cabal_doctest(1,0,0) + +import Distribution.Extra.Doctest ( defaultMainWithDoctests ) +main :: IO () +main = defaultMainWithDoctests "doctests" + +#else + +#ifdef MIN_VERSION_Cabal +-- If the macro is defined, we have new cabal-install, +-- but for some reason we don't have cabal-doctest in package-db +-- +-- Probably we are running cabal sdist, when otherwise using new-build +-- workflow +#warning You are configuring this package without cabal-doctest installed. \ + The doctests test-suite will not work as a result. \ + To fix this, install cabal-doctest before configuring. +#endif + import Distribution.Simple + +main :: IO () main = defaultMain + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swagger2-2.1.4/src/Data/Swagger/Internal/Schema.hs new/swagger2-2.1.4.1/src/Data/Swagger/Internal/Schema.hs --- old/swagger2-2.1.4/src/Data/Swagger/Internal/Schema.hs 2017-04-25 20:57:21.000000000 +0200 +++ new/swagger2-2.1.4.1/src/Data/Swagger/Internal/Schema.hs 2017-07-14 19:49:53.000000000 +0200 @@ -65,10 +65,6 @@ import qualified Data.Swagger.Lens as Swagger import Data.Swagger.SchemaOptions -#ifdef __DOCTEST__ -import Data.Swagger.Lens (name, schema) -#endif - #if __GLASGOW_HASKELL__ < 800 #else import qualified Data.ByteString as BS @@ -100,6 +96,8 @@ -- {-\# LANGUAGE OverloadedLists \#-} -- allows to write 'Map' and 'HashMap' as lists -- -- import Control.Lens +-- import Data.Proxy +-- import Data.Swagger -- -- data Coord = Coord { x :: Double, y :: Double } -- @@ -727,7 +725,7 @@ type AllNullary = All -class GSumToSchema f where +class GSumToSchema (f :: * -> *) where gsumToSchema :: SchemaOptions -> proxy f -> Schema -> WriterT AllNullary (Declare (Definitions Schema)) Schema instance (GSumToSchema f, GSumToSchema g) => GSumToSchema (f :+: g) where @@ -766,3 +764,5 @@ data Proxy3 a b c = Proxy3 +-- $setup +-- >>> import Data.Swagger diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swagger2-2.1.4/swagger2.cabal new/swagger2-2.1.4.1/swagger2.cabal --- old/swagger2-2.1.4/swagger2.cabal 2017-04-25 21:09:01.000000000 +0200 +++ new/swagger2-2.1.4.1/swagger2.cabal 2017-07-14 19:49:53.000000000 +0200 @@ -1,7 +1,11 @@ name: swagger2 -version: 2.1.4 +version: 2.1.4.1 synopsis: Swagger 2.0 data model -description: Please see README.md +description: + This library is inteded to be used for decoding and encoding Swagger 2.0 API + specifications as well as manipulating them. + . + The original Swagger 2.0 specification is available at http://swagger.io/specification/. homepage: https://github.com/GetShopTV/swagger2 bug-reports: https://github.com/GetShopTV/swagger2/issues license: BSD3 @@ -10,14 +14,18 @@ maintainer: [email protected] copyright: (c) 2015-2016, GetShopTV category: Web -build-type: Simple +build-type: Custom extra-source-files: README.md , CHANGELOG.md , examples/*.hs , include/overlapping-compat.h cabal-version: >=1.10 -tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.1 +tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.1 + +custom-setup + setup-depends: + base, Cabal, cabal-doctest >=1.0.2 && <1.1 library hs-source-dirs: src @@ -39,13 +47,13 @@ Data.Swagger.Internal.ParamSchema Data.Swagger.Internal.Utils Data.Swagger.Internal.AesonUtils - build-depends: base >=4.7 && <4.10 + build-depends: base >=4.7 && <4.11 , base-compat >=0.9.1 && <0.10 , aeson >=0.11.2.1 , bytestring , containers , hashable - , generics-sop >=0.2 && <0.3 + , generics-sop >=0.2 && <0.4 , http-media , insert-ordered-containers >=0.1.0.0 && <0.3 , lens @@ -93,11 +101,12 @@ Data.Swagger.Schema.ValidationSpec default-language: Haskell2010 -test-suite doctest - build-depends: base, doctest, Glob +test-suite doctests + -- See QuickCheck note in https://github.com/phadej/cabal-doctest#notes + build-depends: base, doctest, Glob, QuickCheck default-language: Haskell2010 hs-source-dirs: test - main-is: DocTest.hs + main-is: doctests.hs type: exitcode-stdio-1.0 source-repository head diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swagger2-2.1.4/test/DocTest.hs new/swagger2-2.1.4.1/test/DocTest.hs --- old/swagger2-2.1.4/test/DocTest.hs 2016-02-01 15:59:31.000000000 +0100 +++ new/swagger2-2.1.4.1/test/DocTest.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -module Main (main) where - -import System.FilePath.Glob (glob) -import Test.DocTest (doctest) - -main :: IO () -main = glob "src/**/*.hs" >>= doctest' - where doctest' files = doctest $ "-Iinclude/" : "-D__DOCTEST__" : files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swagger2-2.1.4/test/doctests.hs new/swagger2-2.1.4.1/test/doctests.hs --- old/swagger2-2.1.4/test/doctests.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/swagger2-2.1.4.1/test/doctests.hs 2017-07-14 19:49:53.000000000 +0200 @@ -0,0 +1,12 @@ +module Main where + +import Build_doctests (flags, pkgs, module_sources) +import Data.Foldable (traverse_) +import Test.DocTest + +main :: IO () +main = do + traverse_ putStrLn args + doctest args + where + args = flags ++ pkgs ++ module_sources
