August 2017 - openSUSE Commits - openSUSE Mailing Lists

commit ghc-socket for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-socket for openSUSE:Factory checked in at 2017-08-31 20:59:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-socket (Old) and /work/SRC/openSUSE:Factory/.ghc-socket.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-socket" Thu Aug 31 20:59:46 2017 rev:4 rq:513499 version:0.8.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-socket/ghc-socket.changes 2017-03-14 10:05:59.249130996 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-socket.new/ghc-socket.changes 2017-08-31 20:59:48.871166806 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:04:32 UTC 2017 - psimons(a)suse.com + +- Update to version 0.8.0.1. + +------------------------------------------------------------------- Old: ---- socket-0.7.0.0.tar.gz New: ---- socket-0.8.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-socket.spec ++++++ --- /var/tmp/diff_new_pack.KuMcW0/_old 2017-08-31 20:59:49.843030258 +0200 +++ /var/tmp/diff_new_pack.KuMcW0/_new 2017-08-31 20:59:49.859028010 +0200 @@ -19,7 +19,7 @@ %global pkg_name socket %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.7.0.0 +Version: 0.8.0.1 Release: 0 Summary: An extensible socket library License: MIT ++++++ socket-0.7.0.0.tar.gz -> socket-0.8.0.1.tar.gz ++++++ ++++ 2118 lines of diff (skipped)

1 0

commit ghc-slug for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-slug for openSUSE:Factory checked in at 2017-08-31 20:59:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-slug (Old) and /work/SRC/openSUSE:Factory/.ghc-slug.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-slug" Thu Aug 31 20:59:42 2017 rev:4 rq:513498 version:0.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-slug/ghc-slug.changes 2017-05-10 20:49:47.357013048 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-slug.new/ghc-slug.changes 2017-08-31 20:59:46.439508461 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:06:59 UTC 2017 - psimons(a)suse.com + +- Update to version 0.1.7. + +------------------------------------------------------------------- Old: ---- slug-0.1.6.tar.gz slug.cabal New: ---- slug-0.1.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-slug.spec ++++++ --- /var/tmp/diff_new_pack.3AUCgV/_old 2017-08-31 20:59:48.271251097 +0200 +++ /var/tmp/diff_new_pack.3AUCgV/_new 2017-08-31 20:59:48.279249973 +0200 @@ -19,14 +19,13 @@ %global pkg_name slug %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.1.6 +Version: 0.1.7 Release: 0 Summary: Type-safe slugs for Yesod ecosystem 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}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-aeson-devel @@ -57,7 +56,6 @@ %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ slug-0.1.6.tar.gz -> slug-0.1.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slug-0.1.6/CHANGELOG.md new/slug-0.1.7/CHANGELOG.md --- old/slug-0.1.6/CHANGELOG.md 2017-01-02 22:52:16.000000000 +0100 +++ new/slug-0.1.7/CHANGELOG.md 2017-07-22 07:25:18.000000000 +0200 @@ -1,3 +1,9 @@ +## Slug 0.1.7 + +* Defined `Semigroup` instance for `Slug`. + +* Improved documentation and metadata. + ## Slug 0.1.6 * Allowed Aeson 1.1. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slug-0.1.6/README.md new/slug-0.1.7/README.md --- old/slug-0.1.6/README.md 2017-01-01 01:21:17.000000000 +0100 +++ new/slug-0.1.7/README.md 2017-06-02 17:36:47.000000000 +0200 @@ -7,17 +7,17 @@ [![Build Status](https://travis-ci.org/mrkkrp/slug.svg?branch=master)](https://travi… [![Coverage Status](https://coveralls.io/repos/mrkkrp/slug/badge.svg?branch=master&service=github)](https://coveralls.io/github/mrkkrp/slug?branch=master) -This is [slug](https://en.wikipedia.org/wiki/Semantic_URL#Slug) -implementation that plays nicely with [Yesod](http://www.yesodweb.com/) +This is a [slug](https://en.wikipedia.org/wiki/Semantic_URL#Slug) +implementation that plays nicely with the [Yesod](http://www.yesodweb.com/) ecosystem. Although it's fairly easy to write this thing, slugs are useful and general enough to be coded once and be used again and again. So this little package eliminates some boilerplate you might find yourself writing. ## Quick start -The package provides data type `Slug` that is instance of various type -classes, so it can be used with Persistent or as part of route. It also -works with `aeson` package. +The package provides the data type `Slug` that is an instance of various +type classes, so it can be used with Persistent or as a part of a route. It +also works with the `aeson` package. The slugs are completely type-safe. When you have a `Slug`, you can be sure that there is a valid slug inside. Valid slug has the following qualities: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slug-0.1.6/Web/Slug.hs new/slug-0.1.7/Web/Slug.hs --- old/slug-0.1.6/Web/Slug.hs 2017-01-03 00:29:08.000000000 +0100 +++ new/slug-0.1.7/Web/Slug.hs 2017-06-02 17:36:47.000000000 +0200 @@ -3,7 +3,7 @@ -- Copyright : © 2015–2017 Mark Karpov -- License : BSD 3 clause -- --- Maintainer : Mark Karpov <markkarpov(a)openmailbox.org> +-- Maintainer : Mark Karpov <markkarpov92(a)gmail.com> -- Stability : experimental -- Portability : portable -- @@ -23,12 +23,13 @@ where import Control.Exception (Exception (..)) -import Control.Monad ((>=>), liftM) +import Control.Monad import Control.Monad.Catch (MonadThrow (..)) import Data.Aeson.Types (ToJSON (..), FromJSON (..)) import Data.Char (isAlphaNum) import Data.Data (Data) import Data.Maybe (isJust, fromJust) +import Data.Semigroup import Data.Text (Text) import Data.Typeable (Typeable) import Database.Persist.Class (PersistField (..)) @@ -41,11 +42,11 @@ import qualified Data.Text as T #if !MIN_VERSION_base(4,8,0) -import Control.Applicative ((<$>)) +import Control.Applicative #endif -- | This exception is thrown by 'mkSlug' when its input cannot be converted --- into proper 'Slug'. +-- into a proper 'Slug'. data SlugException = InvalidInput Text -- ^ Slug cannot be generated for given text @@ -74,12 +75,15 @@ newtype Slug = Slug Text deriving (Eq, Ord, Data, Typeable) --- | Create 'Slug' from 'Text', all necessary transformations are --- applied. Argument of this function can be title of an article or +instance Semigroup Slug where + x <> y = Slug (unSlug x <> "-" <> unSlug y) + +-- | Create a 'Slug' from a 'Text' value, all necessary transformations are +-- applied. The argument of this function can be title of an article or -- something like that. -- --- Note that result is inside 'MonadThrow', that means you can just get it --- in 'Maybe', in more complex contexts it will throw 'SlugException' +-- Note that the result is inside 'MonadThrow', that means you can just get +-- it in 'Maybe', in more complex contexts it will throw 'SlugException' -- exception using 'InvalidInput' constructor. -- -- This function also has a useful property: @@ -93,30 +97,32 @@ then throwM (InvalidInput text) else return . Slug . T.intercalate "-" $ ws --- | Get textual representation if 'Slug'. +-- | Get textual representation of a 'Slug'. unSlug :: Slug -> Text unSlug (Slug x) = x --- | Convert 'Text' to possibly empty collection of words. Every word is --- guaranteed to be non-empty alpha-numeric lowercased sequence of +-- | Convert 'Text' to a possibly empty collection of words. Every word is +-- guaranteed to be non-empty alpha-numeric lower-cased sequence of -- characters. getSlugWords :: Text -> [Text] getSlugWords = T.words . T.toLower . T.map f . T.replace "'" "" - where f x = if isAlphaNum x then x else ' ' + where + f x = if isAlphaNum x then x else ' ' --- | Convert 'Text' into 'Slug' only when it is already valid slug. +-- | Convert a 'Text' into a 'Slug' only when it is already valid slug. -- --- This function can throw 'SlugException' exception using 'InvalidSlug' +-- This function can throw the 'SlugException' exception using 'InvalidSlug' -- constructor. parseSlug :: MonadThrow m => Text -> m Slug parseSlug v = mkSlug v >>= check - where check s = - if unSlug s == v - then return s - else throwM (InvalidSlug v) + where + check s = + if unSlug s == v + then return s + else throwM (InvalidSlug v) -- | Ensure that given 'Slug' is not longer than given maximum number of -- characters. If truncated slug ends in a dash, remove that dash too. (Dash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slug-0.1.6/slug.cabal new/slug-0.1.7/slug.cabal --- old/slug-0.1.6/slug.cabal 2017-01-03 00:30:48.000000000 +0100 +++ new/slug-0.1.7/slug.cabal 2017-07-22 07:57:13.000000000 +0200 @@ -1,42 +1,11 @@ --- --- Cabal configuration for ‘slug’. --- --- Copyright © 2015–2017 Mark Karpov --- --- Redistribution and use in source and binary forms, with or without --- modification, are permitted provided that the following conditions are --- met: --- --- * Redistributions of source code must retain the above copyright notice, --- this list of conditions and the following disclaimer. --- --- * Redistributions in binary form must reproduce the above copyright --- notice, this list of conditions and the following disclaimer in the --- documentation and/or other materials provided with the distribution. --- --- * Neither the name Mark Karpov nor the names of contributors may be used --- to endorse or promote products derived from this software without --- specific prior written permission. --- --- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS “AS IS” AND ANY --- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED --- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE --- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY --- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL --- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS --- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) --- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, --- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN --- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE --- POSSIBILITY OF SUCH DAMAGE. - name: slug -version: 0.1.6 -cabal-version: >= 1.10 +version: 0.1.7 +cabal-version: >= 1.18 +tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.1 license: BSD3 license-file: LICENSE.md -author: Mark Karpov <markkarpov(a)opmbx.org> -maintainer: Mark Karpov <markkarpov(a)opmbx.org> +author: Mark Karpov <markkarpov92(a)gmail.com> +maintainer: Mark Karpov <markkarpov92(a)gmail.com> homepage: https://github.com/mrkkrp/slug bug-reports: https://github.com/mrkkrp/slug/issues category: Web, Yesod @@ -53,13 +22,15 @@ library build-depends: QuickCheck >= 2.4 && < 3.0 - , aeson >= 0.8 && < 1.2 + , aeson >= 0.8 && < 1.3 , base >= 4.7 && < 5.0 , exceptions >= 0.6 && < 0.9 , http-api-data >= 0.2 && < 0.4 , path-pieces >= 0.1.5 && < 0.3 , persistent >= 2.0 && < 3.0 , text >= 1.0 && < 1.3 + if !impl(ghc >= 8.0) + build-depends: semigroups == 0.18.* default-extensions: OverloadedStrings exposed-modules: Web.Slug if flag(dev) @@ -83,8 +54,10 @@ , hspec >= 2.0 && < 3.0 , http-api-data >= 0.2 && < 0.4 , path-pieces >= 0.1.5 && < 0.3 - , slug >= 0.1.6 + , slug , text >= 1.0 && < 1.3 + if !impl(ghc >= 8.0) + build-depends: semigroups == 0.18.* default-language: Haskell2010 source-repository head diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slug-0.1.6/tests/Main.hs new/slug-0.1.7/tests/Main.hs --- old/slug-0.1.6/tests/Main.hs 2017-01-03 00:29:34.000000000 +0100 +++ new/slug-0.1.7/tests/Main.hs 2017-07-22 07:24:52.000000000 +0200 @@ -1,44 +1,13 @@ --- --- Slug tests. --- --- Copyright © 2015–2017 Mark Karpov --- --- Redistribution and use in source and binary forms, with or without --- modification, are permitted provided that the following conditions are --- met: --- --- * Redistributions of source code must retain the above copyright notice, --- this list of conditions and the following disclaimer. --- --- * Redistributions in binary form must reproduce the above copyright --- notice, this list of conditions and the following disclaimer in the --- documentation and/or other materials provided with the distribution. --- --- * Neither the name Mark Karpov nor the names of contributors may be used --- to endorse or promote products derived from this software without --- specific prior written permission. --- --- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS “AS IS” AND ANY --- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED --- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE --- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY --- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL --- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS --- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) --- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, --- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN --- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE --- POSSIBILITY OF SUCH DAMAGE. - {-# LANGUAGE CPP #-} {-# OPTIONS -fno-warn-orphans #-} module Main (main) where import Control.Monad ((>=>)) -import Data.Char (isAlphaNum, isUpper) +import Data.Char (isAlphaNum) import Data.Function (on) import Data.Maybe (isJust, isNothing) +import Data.Semigroup import Data.Text (Text) import Test.Hspec import Test.QuickCheck @@ -73,9 +42,9 @@ it "does not contain empty words between dashes" $ property $ \slug -> T.splitOn "-" (unSlug slug) `shouldNotSatisfy` any T.null - it "no upper-cased chars found in slugs" $ - property $ \slug -> - unSlug slug `shouldNotSatisfy` T.any isUpper + -- it "no upper-cased chars found in slugs" $ + -- property $ \slug -> + -- unSlug slug `shouldNotSatisfy` T.any isUpper it "showed Slug looks the same as its inner Text" $ property $ \slug -> show slug === show (unSlug slug) @@ -91,6 +60,12 @@ it "valid Slug text is a valid HTTP API data" $ property $ \slug -> parseUrlPiece (toUrlPiece slug) === Right (slug :: Slug) + describe "Semigroup instance of Slug" $ + it "the (<>) operation produces valid slugs in all cases" $ + property $ \x y -> do + let slug = unSlug (x <> y) + slug' <- unSlug <$> parseSlug slug + slug' `shouldBe` slug describe "mkSlug" $ do it "Slug transformation in idempotent" $ property $ \x ->

1 0

commit ghc-singleton-bool for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-singleton-bool for openSUSE:Factory checked in at 2017-08-31 20:59:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-singleton-bool (Old) and /work/SRC/openSUSE:Factory/.ghc-singleton-bool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-singleton-bool" Thu Aug 31 20:59:40 2017 rev:2 rq:513497 version:0.1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-singleton-bool/ghc-singleton-bool.changes 2017-04-12 18:09:02.182872066 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-singleton-bool.new/ghc-singleton-bool.changes 2017-08-31 20:59:42.212102422 +0200 @@ -1,0 +2,5 @@ +Fri Jul 28 03:01:25 UTC 2017 - psimons(a)suse.com + +- Update to version 0.1.2.0 revision 1. + +------------------------------------------------------------------- New: ---- singleton-bool.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-singleton-bool.spec ++++++ --- /var/tmp/diff_new_pack.6cX9fn/_old 2017-08-31 20:59:43.339943958 +0200 +++ /var/tmp/diff_new_pack.6cX9fn/_new 2017-08-31 20:59:43.339943958 +0200 @@ -25,6 +25,7 @@ Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -48,6 +49,7 @@ %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ singleton-bool.cabal ++++++ name: singleton-bool version: 0.1.2.0 x-revision: 1 synopsis: Type level booleans description: Type level booleans. . @singletons@ package provides similar functionality, but it has tight dependency constraints. category: Web homepage: https://github.com/phadej/singleton-bool#readme bug-reports: https://github.com/phadej/singleton-bool/issues author: Oleg Grenrus <oleg.grenrus(a)iki.fi> maintainer: Oleg Grenrus <oleg.grenrus(a)iki.fi> license: BSD3 license-file: LICENSE build-type: Simple cabal-version: >= 1.10 tested-with: GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.1 extra-source-files: CHANGELOG.md README.md source-repository head type: git location: https://github.com/phadej/singleton-bool library hs-source-dirs: src ghc-options: -Wall build-depends: base >=4.5 && <4.11 exposed-modules: Data.Singletons.Bool default-language: Haskell2010

1 0

commit ghc-simple-log for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-simple-log for openSUSE:Factory checked in at 2017-08-31 20:59:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-simple-log (Old) and /work/SRC/openSUSE:Factory/.ghc-simple-log.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-simple-log" Thu Aug 31 20:59:38 2017 rev:4 rq:513496 version:0.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-simple-log/ghc-simple-log.changes 2017-06-22 10:39:00.649314823 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-simple-log.new/ghc-simple-log.changes 2017-08-31 20:59:39.784443515 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:08:08 UTC 2017 - psimons(a)suse.com + +- Update to version 0.9.2. + +------------------------------------------------------------------- Old: ---- simple-log-0.5.1.tar.gz simple-log.cabal New: ---- simple-log-0.9.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-simple-log.spec ++++++ --- /var/tmp/diff_new_pack.GtaSFQ/_old 2017-08-31 20:59:40.868291231 +0200 +++ /var/tmp/diff_new_pack.GtaSFQ/_new 2017-08-31 20:59:40.892287860 +0200 @@ -17,32 +17,41 @@ %global pkg_name simple-log +%bcond_with tests Name: ghc-%{pkg_name} -Version: 0.5.1 +Version: 0.9.2 Release: 0 Summary: Simple log for Haskell 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}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-SafeSemaphore-devel BuildRequires: ghc-async-devel +BuildRequires: ghc-base-unicode-symbols-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-data-default-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-exceptions-devel BuildRequires: ghc-filepath-devel +BuildRequires: ghc-hformat-devel +BuildRequires: ghc-microlens-devel +BuildRequires: ghc-microlens-platform-devel +BuildRequires: ghc-mmorph-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel BuildRequires: ghc-transformers-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with tests} +BuildRequires: ghc-hspec-devel +%endif %description -Log library for Haskell with removing unnecessary traces. +Log library for Haskell. %package devel Summary: Haskell %{pkg_name} library development files @@ -57,7 +66,6 @@ %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -65,6 +73,9 @@ %install %ghc_lib_install +%check +%cabal_test + %post devel %ghc_pkg_recache ++++++ simple-log-0.5.1.tar.gz -> simple-log-0.9.2.tar.gz ++++++ ++++ 1606 lines of diff (skipped)

1 0

commit ghc-show-prettyprint for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-show-prettyprint for openSUSE:Factory checked in at 2017-08-31 20:59:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-show-prettyprint (Old) and /work/SRC/openSUSE:Factory/.ghc-show-prettyprint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-show-prettyprint" Thu Aug 31 20:59:36 2017 rev:3 rq:513495 version:0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-show-prettyprint/ghc-show-prettyprint.changes 2017-06-22 10:38:59.401490746 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-show-prettyprint.new/ghc-show-prettyprint.changes 2017-08-31 20:59:37.480767187 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:44 UTC 2017 - psimons(a)suse.com + +- Update to version 0.2 revision 1. + +------------------------------------------------------------------- Old: ---- show-prettyprint-0.1.2.1.tar.gz New: ---- show-prettyprint-0.2.tar.gz show-prettyprint.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-show-prettyprint.spec ++++++ --- /var/tmp/diff_new_pack.YWOK1m/_old 2017-08-31 20:59:38.816579502 +0200 +++ /var/tmp/diff_new_pack.YWOK1m/_new 2017-08-31 20:59:38.844575569 +0200 @@ -19,15 +19,17 @@ %global pkg_name show-prettyprint %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.1.2.1 +Version: 0.2 Release: 0 Summary: Robust prettyprinter for output of auto-generated Show instances 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}-%{ve… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-ansi-wl-pprint-devel +BuildRequires: ghc-prettyprinter-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-trifecta-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,6 +54,7 @@ %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -74,6 +77,6 @@ %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.md +%doc CHANGELOG.md README.md %changelog ++++++ show-prettyprint-0.1.2.1.tar.gz -> show-prettyprint-0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/show-prettyprint-0.1.2.1/CHANGELOG.md new/show-prettyprint-0.2/CHANGELOG.md --- old/show-prettyprint-0.1.2.1/CHANGELOG.md 1970-01-01 01:00:00.000000000 +0100 +++ new/show-prettyprint-0.2/CHANGELOG.md 2017-06-01 17:17:24.000000000 +0200 @@ -0,0 +1,5 @@ +# 0.2 + +Prettyprint based on the `prettyprinter` library, instead of `ansi-wl-pprint`. +To support the `Diagnostic` module, the Trifecta-generated `Doc` has to be +rendered still, so we cannot drop the dependency on ansi-wl-pprint just yet. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/show-prettyprint-0.1.2.1/show-prettyprint.cabal new/show-prettyprint-0.2/show-prettyprint.cabal --- old/show-prettyprint-0.1.2.1/show-prettyprint.cabal 2017-06-01 15:26:58.000000000 +0200 +++ new/show-prettyprint-0.2/show-prettyprint.cabal 2017-06-01 17:17:46.000000000 +0200 @@ -1,5 +1,5 @@ name: show-prettyprint -version: 0.1.2.1 +version: 0.2 synopsis: Robust prettyprinter for output of auto-generated Show instances description: See README.md @@ -12,6 +12,7 @@ category: User Interfaces, Text build-type: Simple extra-source-files: README.md + , CHANGELOG.md , .stylish-haskell.yaml cabal-version: >=1.10 @@ -22,9 +23,9 @@ , Text.Show.Prettyprint.Internal build-depends: base >= 4.7 && < 5 , trifecta >= 1.6 + , prettyprinter < 1.1 - -- Transitive dependency of Trifecta, so let the - -- version be sorted out by that + -- Transitive dep of Trifecta, figure it out via that one , ansi-wl-pprint ghc-options: -Wall default-language: Haskell2010 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/show-prettyprint-0.1.2.1/src/Text/Show/Prettyprint/Diagnostic.hs new/show-prettyprint-0.2/src/Text/Show/Prettyprint/Diagnostic.hs --- old/show-prettyprint-0.1.2.1/src/Text/Show/Prettyprint/Diagnostic.hs 2016-11-14 10:51:47.000000000 +0100 +++ new/show-prettyprint-0.2/src/Text/Show/Prettyprint/Diagnostic.hs 2017-06-01 17:13:04.000000000 +0200 @@ -17,9 +17,9 @@ -import Data.Monoid -import Text.PrettyPrint.ANSI.Leijen as Ppr hiding ((<>)) -import Text.Trifecta as Tri +import Data.Text.Prettyprint.Doc +import qualified Text.PrettyPrint.ANSI.Leijen as OldAnsiPpr +import Text.Trifecta as Tri import Text.Show.Prettyprint.Internal @@ -30,7 +30,7 @@ prettifyShowErr :: String -> String prettifyShowErr s = case parseString shownP mempty s of Success x -> show x - Failure ErrInfo{ _errDoc = e } -> "ERROR " <> show (plain e) + Failure ErrInfo{ _errDoc = e } -> "ERROR " <> show (OldAnsiPpr.plain e) -- | 'prettifyShowErr' with the 'show' baked in. prettyShowErr :: Show a => a -> String diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/show-prettyprint-0.1.2.1/src/Text/Show/Prettyprint/Internal.hs new/show-prettyprint-0.2/src/Text/Show/Prettyprint/Internal.hs --- old/show-prettyprint-0.1.2.1/src/Text/Show/Prettyprint/Internal.hs 2016-11-14 11:26:22.000000000 +0100 +++ new/show-prettyprint-0.2/src/Text/Show/Prettyprint/Internal.hs 2017-06-01 17:15:05.000000000 +0200 @@ -19,12 +19,14 @@ import Control.Applicative -import Text.PrettyPrint.ANSI.Leijen as Ppr hiding ((<>)) -import Text.Trifecta as Tri +import Data.Text.Prettyprint.Doc as Ppr +import Text.Trifecta as Tri -- $setup +-- +-- >>> import Text.PrettyPrint.ANSI.Leijen (plain) -- >>> :{ -- let testParse p s = case parseString p mempty s of -- Success x -> print x @@ -34,7 +36,7 @@ -- | Prettyparser for a 'show'-generated string -shownP :: Parser Doc +shownP :: Parser (Doc ann) shownP = valueP <* eof -- | Prettyparser for a constructor, which is roughly a word applied to @@ -42,7 +44,7 @@ -- -- >>> testParse valueP "Just ('c', Left ())" -- Just ('c',Left ()) -valueP :: Parser Doc +valueP :: Parser (Doc ann) valueP = do thing <- choice [identifierP, numberP, stringLitP, charLitP] args <- many argP @@ -55,10 +57,10 @@ -- -- >>> testParse identifierP "_foo'bar" -- _foo'bar -identifierP :: Parser Doc +identifierP :: Parser (Doc ann) identifierP = token (p <?> "identifier") where - p = fmap Ppr.text (some (alphaNum <|> oneOf "'_")) + p = fmap Ppr.pretty (some (alphaNum <|> oneOf "'_")) -- | Number in integer or scientific notation. -- @@ -67,28 +69,28 @@ -- -- >>> testParse numberP "-123.4e56" -- -1.234e58 -numberP :: Parser Doc +numberP :: Parser (Doc ann) numberP = p <?> "number" where p = integerOrDouble >>= \case - Left i -> pure (Ppr.integer i) - Right d -> pure (Ppr.double d) + Left i -> pure (pretty i) + Right d -> pure (pretty d) -- | -- >>> testParse stringLitP "\"Hello world!\"" -- "Hello world!" -stringLitP :: Parser Doc +stringLitP :: Parser (Doc ann) stringLitP = token (p <?> "string literal") where - p = fmap (dquotes . Ppr.string) stringLiteral + p = fmap (dquotes . pretty) (stringLiteral :: Parser String) -- | -- >>> testParse charLitP "'c'" -- 'c' -charLitP :: Parser Doc +charLitP :: Parser (Doc ann) charLitP = token (p <?> "char literal") where - p = fmap (squotes . Ppr.char) Tri.charLiteral + p = fmap (squotes . pretty) Tri.charLiteral -- | Anything that could be considered an argument to something else. -- @@ -97,23 +99,23 @@ -- -- >>> testParse argP "['h', 'e', 'l', 'l', 'o']" -- ['h','e','l','l','o'] -argP :: Parser Doc +argP :: Parser (Doc ann) argP = (token . choice) [unitP, tupleP, listP, recordP, valueP] -- | -- >>> testParse unitP "()" -- () -unitP :: Parser Doc +unitP :: Parser (Doc ann) unitP = p <?> "unit" where - p = fmap Ppr.string (Tri.string "()") + p = fmap pretty (Tri.string "()") -- | Prettyparser for tuples from size 1. Since 1-tuples are just parenthesized -- expressions to first order approximation, this parser handles those as well. -- -- >>> testParse tupleP "((), True, 'c')" -- ((),True,'c') -tupleP :: Parser Doc +tupleP :: Parser (Doc ann) tupleP = p <?> "tuple" where p = fmap (encloseSep lparen rparen Ppr.comma) (Tri.parens (do @@ -126,7 +128,7 @@ -- -- >>> testParse listP "[\"Hello\", World]" -- ["Hello",World] -listP :: Parser Doc +listP :: Parser (Doc ann) listP = p <?> "list" where p = fmap (encloseSep lbracket rbracket Ppr.comma) @@ -135,7 +137,7 @@ -- | -- >>> testParse recordP "{ r1 = (), r2 = Just True }" -- {r1 = (),r2 = Just True} -recordP :: Parser Doc +recordP :: Parser (Doc ann) recordP = p <?> "record" where p = fmap (encloseSep lbrace rbrace Ppr.comma) (Tri.braces (sepBy recordEntryP Tri.comma)) @@ -143,4 +145,4 @@ lhs <- token identifierP _ <- token (Tri.char '=') rhs <- argP - pure (lhs <+> Ppr.string "=" <+> rhs) + pure (lhs <+> pretty "=" <+> rhs) ++++++ show-prettyprint.cabal ++++++ name: show-prettyprint version: 0.2 x-revision: 1 synopsis: Robust prettyprinter for output of auto-generated Show instances description: See README.md homepage: https://github.com/quchen/show-prettyprint#readme license: BSD3 license-file: LICENSE.md author: David Luposchainsky <dluposchainsky (λ) google> maintainer: David Luposchainsky <dluposchainsky (λ) google> copyright: David Luposchainsky, 2016 category: User Interfaces, Text build-type: Simple extra-source-files: README.md , CHANGELOG.md , .stylish-haskell.yaml cabal-version: >=1.10 library hs-source-dirs: src exposed-modules: Text.Show.Prettyprint , Text.Show.Prettyprint.Diagnostic , Text.Show.Prettyprint.Internal build-depends: base >= 4.7 && < 5 , trifecta >= 1.6 , prettyprinter < 1.2 -- Transitive dep of Trifecta, figure it out via that one , ansi-wl-pprint ghc-options: -Wall default-language: Haskell2010 test-suite doctest type: exitcode-stdio-1.0 hs-source-dirs: test/Doctest main-is: Main.hs build-depends: base , doctest >= 0.9 ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N default-language: Haskell2010 source-repository head type: git location: https://github.com/quchen/show-prettyprint

1 0

commit ghc-shell-conduit for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-shell-conduit for openSUSE:Factory checked in at 2017-08-31 20:59:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-shell-conduit (Old) and /work/SRC/openSUSE:Factory/.ghc-shell-conduit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-shell-conduit" Thu Aug 31 20:59:34 2017 rev:2 rq:513494 version:4.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-shell-conduit/ghc-shell-conduit.changes 2017-01-22 00:09:29.785972371 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-shell-conduit.new/ghc-shell-conduit.changes 2017-08-31 20:59:35.721014437 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:51 UTC 2017 - psimons(a)suse.com + +- Update to version 4.6.1. + +------------------------------------------------------------------- Old: ---- shell-conduit-4.5.2.tar.gz New: ---- shell-conduit-4.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-shell-conduit.spec ++++++ --- /var/tmp/diff_new_pack.L12izh/_old 2017-08-31 20:59:36.816860468 +0200 +++ /var/tmp/diff_new_pack.L12izh/_new 2017-08-31 20:59:36.844856535 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-shell-conduit # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,16 @@ %global pkg_name shell-conduit +%bcond_with tests Name: ghc-%{pkg_name} -Version: 4.5.2 +Version: 4.6.1 Release: 0 Summary: Write shell scripts with Conduit License: BSD-3-Clause -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-async-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-conduit-devel @@ -47,7 +47,10 @@ BuildRequires: ghc-transformers-devel BuildRequires: ghc-unix-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps +%if %{with tests} +BuildRequires: ghc-hspec-devel +BuildRequires: ghc-hspec-expectations-devel +%endif %description Write shell scripts with Conduit. See "Data.Conduit.Shell" for documentation. @@ -66,14 +69,14 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install +%check +%cabal_test %post devel %ghc_pkg_recache @@ -87,6 +90,6 @@ %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.md +%doc CHANGELOG.md README.md %changelog ++++++ shell-conduit-4.5.2.tar.gz -> shell-conduit-4.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shell-conduit-4.5.2/CHANGELOG.md new/shell-conduit-4.6.1/CHANGELOG.md --- old/shell-conduit-4.5.2/CHANGELOG.md 1970-01-01 01:00:00.000000000 +0100 +++ new/shell-conduit-4.6.1/CHANGELOG.md 2017-03-06 21:23:29.000000000 +0100 @@ -0,0 +1,10 @@ +# 4.6.1 + +* Fix import error in Stackage: https://github.com/fpco/stackage/issues/2355 + +# 4.6.0 + +* Add basic tests code +* Accept list as variadic command line arguments + `mkdir "-p" ["folder1", "folder2"]` works now. +* TRAVIS CI added diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shell-conduit-4.5.2/README.md new/shell-conduit-4.6.1/README.md --- old/shell-conduit-4.5.2/README.md 2015-03-01 12:04:31.000000000 +0100 +++ new/shell-conduit-4.6.1/README.md 2017-03-05 00:24:06.000000000 +0100 @@ -1,9 +1,9 @@ -shell-conduit [![Hackage](https://img.shields.io/hackage/v/shell-conduit.svg?style=flat)](https://hackage.haskell.org/package/shell-conduit) +shell-conduit [![Hackage](https://img.shields.io/hackage/v/shell-conduit.svg?style=flat)](https://hackage.haskell.org/package/shell-conduit) [![Build Status](https://travis-ci.org/psibi/shell-conduit.svg?branch=master)](https… ===== Write shell scripts with Conduit. Still in the experimental phase. -[Haddock API documentation](http://chrisdone.github.io/shell-conduit/). +[Haddock API documentation](https://www.stackage.org/package/shell-conduit). ### Examples diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shell-conduit-4.5.2/shell-conduit.cabal new/shell-conduit-4.6.1/shell-conduit.cabal --- old/shell-conduit-4.5.2/shell-conduit.cabal 2015-03-01 12:04:31.000000000 +0100 +++ new/shell-conduit-4.6.1/shell-conduit.cabal 2017-03-06 21:08:48.000000000 +0100 @@ -1,17 +1,18 @@ name: shell-conduit -version: 4.5.2 +version: 4.6.1 synopsis: Write shell scripts with Conduit description: Write shell scripts with Conduit. See "Data.Conduit.Shell" for documentation. license: BSD3 license-file: LICENSE author: Chris Done -maintainer: chrisdone(a)gmail.com -copyright: 2014 Chris Done +maintainer: Sibi Prabakaran <sibi(a)psibi.in> +copyright: 2014-2017 Chris Done category: Conduit, Scripting build-type: Simple cabal-version: >=1.8 -homepage: https://github.com/chrisdone/shell-conduit -extra-source-files: README.md +homepage: https://github.com/psibi/shell-conduit +extra-source-files: CHANGELOG.md README.md +bug-reports: https://github.com/psibi/shell-conduit/issues library hs-source-dirs: src/ @@ -33,7 +34,7 @@ , filepath , monad-control , monads-tf - , process + , process >= 1.2.1.0 , resourcet , semigroups , split @@ -43,6 +44,18 @@ , transformers-base , unix >= 2.7.0.1 +test-suite test + type: exitcode-stdio-1.0 + ghc-options: -Wall + hs-source-dirs: test/ + main-is: Spec.hs + + build-depends: base >= 4.5 && < 5, + shell-conduit, + hspec >= 2.1 && < 3, + hspec-expectations, + template-haskell + source-repository head type: git - location: https://github.com/chrisdone/shell-conduit.git + location: http://github.com/psibi/shell-conduit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shell-conduit-4.5.2/src/Data/Conduit/Shell/PATH.hs new/shell-conduit-4.6.1/src/Data/Conduit/Shell/PATH.hs --- old/shell-conduit-4.5.2/src/Data/Conduit/Shell/PATH.hs 2015-03-01 12:04:31.000000000 +0100 +++ new/shell-conduit-4.6.1/src/Data/Conduit/Shell/PATH.hs 2017-03-06 21:05:15.000000000 +0100 @@ -1,24 +1,29 @@ {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE NoMonomorphismRestriction #-} {-# LANGUAGE QuasiQuotes #-} -{-# OPTIONS_GHC -fno-warn-missing-signatures -fno-warn-unused-imports #-} +{-# OPTIONS_GHC + -fno-warn-missing-signatures -fno-warn-unused-imports #-} -- | All binaries in PATH. - module Data.Conduit.Shell.PATH where -import Control.Monad -import Control.Monad.IO.Class -import Data.Conduit.Shell.Process -import Data.Conduit.Shell.TH -import Data.Conduit.Shell.Variadic -import Data.List +import Control.Monad +import Control.Monad.IO.Class +import Data.Conduit.Shell.Process +import Data.Conduit.Shell.TH +import Data.Conduit.Shell.Variadic +import Data.List import qualified Data.Text as T (unpack) -import Prelude -import System.Directory +import Prelude +import System.Directory -- | Helpful CD command. -cd :: (MonadIO m,CmdArg arg) => arg -> m () -cd fp = liftIO (setCurrentDirectory (T.unpack (toTextArg fp))) +cd + :: (MonadIO m, CmdArg arg) + => arg -> m () +cd fp = + case (toTextArg fp) of + [] -> return () + (path:_) -> liftIO $ setCurrentDirectory (T.unpack path) $(generateBinaries) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shell-conduit-4.5.2/src/Data/Conduit/Shell/Process.hs new/shell-conduit-4.6.1/src/Data/Conduit/Shell/Process.hs --- old/shell-conduit-4.5.2/src/Data/Conduit/Shell/Process.hs 2015-03-01 12:04:31.000000000 +0100 +++ new/shell-conduit-4.6.1/src/Data/Conduit/Shell/Process.hs 2017-03-02 04:16:03.000000000 +0100 @@ -31,21 +31,18 @@ import Control.Exception import Control.Monad import Control.Monad.IO.Class -import Control.Monad.Trans.Resource import Data.ByteString (ByteString) import qualified Data.ByteString as S import Data.Conduit import Data.Conduit.Binary import qualified Data.Conduit.List as CL -import Data.Conduit.Text (Codec) -import qualified Data.Conduit.Text as T +import Data.Conduit.Text (encodeUtf8, decodeUtf8) import Data.Text (Text) import Data.Typeable import System.Exit import System.IO import System.Posix.IO (createPipe, fdToHandle) import System.Process hiding (createPipe) -import System.Process.Internals (createProcess_) -- | A pipeable segment. Either a conduit or a process. data Segment r @@ -77,7 +74,7 @@ do ex <- tryS this case ex of Right x -> pure x - Left (e :: ProcessException) -> that + Left (_ :: ProcessException) -> that empty = throw ProcessEmpty -- | Try something in a segment. @@ -104,6 +101,7 @@ instance Exception ProcessException instance Show ProcessException where + show ProcessEmpty = "empty process" show (ProcessException cp ec) = concat ["The " ,case cmdspec cp of @@ -166,7 +164,7 @@ -- | Work on the stream as 'Text' values from UTF-8. text :: (r ~ (),m ~ IO) => ConduitM Text Text m r -> Segment r -text conduit = bytes (T.decodeUtf8 $= conduit $= T.encodeUtf8) +text conduit' = bytes (decodeUtf8 $= conduit' $= encodeUtf8) -- | Lift a conduit into a segment. bytes :: (a ~ ByteString,m ~ IO) => ConduitM a ByteString m r -> Segment r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shell-conduit-4.5.2/src/Data/Conduit/Shell/TH.hs new/shell-conduit-4.6.1/src/Data/Conduit/Shell/TH.hs --- old/shell-conduit-4.5.2/src/Data/Conduit/Shell/TH.hs 2015-03-01 12:04:31.000000000 +0100 +++ new/shell-conduit-4.6.1/src/Data/Conduit/Shell/TH.hs 2017-03-02 04:16:03.000000000 +0100 @@ -57,7 +57,7 @@ do inScope <- recover (return False) (do void (reify (mkName candidate)) return True) - if inScope || candidate == "import" + if inScope || candidate == "import" || candidate == "type" then getUniqueName (candidate ++ "'") else return (mkName candidate) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shell-conduit-4.5.2/src/Data/Conduit/Shell/Variadic.hs new/shell-conduit-4.6.1/src/Data/Conduit/Shell/Variadic.hs --- old/shell-conduit-4.5.2/src/Data/Conduit/Shell/Variadic.hs 2015-03-01 12:04:31.000000000 +0100 +++ new/shell-conduit-4.6.1/src/Data/Conduit/Shell/Variadic.hs 2017-03-06 21:05:15.000000000 +0100 @@ -2,24 +2,25 @@ {-# LANGUAGE TypeFamilies #-} -- | Variadic process calling. - module Data.Conduit.Shell.Variadic - (ProcessType(..) - ,variadicProcess - ,CmdArg(..)) - where + ( ProcessType(..) + , variadicProcess + , CmdArg(..) + ) where import qualified Data.ByteString as SB import qualified Data.ByteString.Lazy as LB -import Data.Conduit.Shell.Process +import Data.Conduit.Shell.Process import qualified Data.Text as ST import qualified Data.Text.Encoding as ST import qualified Data.Text.Lazy as LT import qualified Data.Text.Lazy.Encoding as LT +import Control.Applicative (pure) -- | A variadic process maker. -variadicProcess :: (ProcessType r) - => String -> r +variadicProcess + :: (ProcessType r) + => String -> r variadicProcess name = spr name [] -- | Make the final conduit. @@ -27,31 +28,48 @@ makeProcessLauncher name args = proc name (map ST.unpack args) -- | Process return type. -class ProcessType t where - spr :: String -> [ST.Text] -> t +class ProcessType t where + spr :: String -> [ST.Text] -> t -instance (r ~ ()) => ProcessType (Segment r) where - spr name args = makeProcessLauncher name (reverse args) +instance (r ~ ()) => + ProcessType (Segment r) where + spr name args = makeProcessLauncher name args -- | Accept strings as arguments. -instance (ProcessType r,CmdArg a) => ProcessType (a -> r) where - spr name args = \a -> spr name (toTextArg a : args) +instance (ProcessType r, CmdArg a) => + ProcessType (a -> r) where + spr name args = \a -> spr name (args ++ toTextArg a) -- | Command line argument. class CmdArg a where - toTextArg :: a -> ST.Text + toTextArg :: a -> [ST.Text] instance CmdArg ST.Text where - toTextArg = id + toTextArg = pure . id instance CmdArg LT.Text where - toTextArg = LT.toStrict + toTextArg = pure . LT.toStrict instance CmdArg SB.ByteString where - toTextArg = ST.decodeUtf8 + toTextArg = pure . ST.decodeUtf8 instance CmdArg LB.ByteString where - toTextArg = LT.toStrict . LT.decodeUtf8 + toTextArg = pure . LT.toStrict . LT.decodeUtf8 instance CmdArg String where - toTextArg = ST.pack + toTextArg = pure . ST.pack + +instance CmdArg [String] where + toTextArg = map ST.pack + +instance CmdArg [ST.Text] where + toTextArg = map id + +instance CmdArg [LT.Text] where + toTextArg = map LT.toStrict + +instance CmdArg [SB.ByteString] where + toTextArg = map ST.decodeUtf8 + +instance CmdArg [LB.ByteString] where + toTextArg = map (LT.toStrict . LT.decodeUtf8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shell-conduit-4.5.2/test/Spec.hs new/shell-conduit-4.6.1/test/Spec.hs --- old/shell-conduit-4.5.2/test/Spec.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/shell-conduit-4.6.1/test/Spec.hs 2017-03-06 21:07:33.000000000 +0100 @@ -0,0 +1,81 @@ +{-# LANGUAGE ExtendedDefaultRules #-} +{-# LANGUAGE CPP #-} + +import Test.Hspec +import Data.Conduit.Shell hiding (ignore) -- https://github.com/fpco/stackage/issues/2355#issue-212177275 +import Data.Conduit.Shell.PATH (true, false) +import Data.Conduit.Shell.Segments (strings, ignore) +import Control.Applicative + +main :: IO () +main = + hspec $ + do describe "SHELL path functions" $ + do it "false" $ + do val <- run $ strings (false <|> echo "failed") + val `shouldBe` ["failed"] + it "true" $ + do val <- run $ strings (true <|> echo "passed") + val `shouldBe` [] + describe "ls" $ + do it "home directory check" $ + do val <- run $ strings (ls "/") + val `shouldContain` ["home"] + it "long option" $ + do val <- run $ strings (ls "-a" ["/"]) + val `shouldContain` ["home"] + describe "multiple string usage" $ + do it "make two directory" $ + do val <- + run $ + do ignore $ mkdir "-p" "mtest1" "mtest2" "mtest3" + strings $ ls "." + run $ rmdir ["mtest1", "mtest2", "mtest3"] + val `shouldContain` ["mtest1", "mtest2", "mtest3"] + describe "list usage in variadic" $ + do it "two directory" $ + do val <- + run $ + do ignore $ mkdir "-p" ["test1", "test2"] + strings $ ls "." + run $ rmdir ["test1", "test2"] + val `shouldContain` ["test1", "test2"] + describe "shell calls" $ + do it "shell ls" $ + do val <- run $ do strings $ shell "ls /" + val `shouldContain` ["home"] + describe "ordering of arguments" $ + do it "echo -e" $ + do val <- run $ do strings $ echo "-e" "hello\n" "haskell" +#ifdef darwin_HOST_OS + val `shouldBe` ["-e hello", " haskell"] +#else + val `shouldBe` ["hello", " haskell"] +#endif + it "mixed variant" $ + do val <- run $ strings $ echo "-e" ["hello\n", "haskell"] +#ifdef darwin_HOST_OS + val `shouldBe` ["-e hello", " haskell"] +#else + val `shouldBe` ["hello", " haskell"] +#endif + it "list variant" $ + do val <- run $ strings $ echo ["-e", "hello\n", "haskell"] +#ifdef darwin_HOST_OS + val `shouldBe` ["-e hello", " haskell"] +#else + val `shouldBe` ["hello", " haskell"] +#endif + describe "cd" $ + do it "cd /" $ + do val <- + run $ + do ignore $ cd "/" + strings pwd + val `shouldBe` ["/"] + it "cd /home" $ + do val <- + run $ + do ignore $ cd ["/home", undefined] + strings pwd + val `shouldBe` ["/home"]

1 0

commit ghc-servant-swagger-ui for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-servant-swagger-ui for openSUSE:Factory checked in at 2017-08-31 20:59:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-servant-swagger-ui (Old) and /work/SRC/openSUSE:Factory/.ghc-servant-swagger-ui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-servant-swagger-ui" Thu Aug 31 20:59:32 2017 rev:4 rq:513493 version:0.2.4.3.0.20 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-servant-swagger-ui/ghc-servant-swagger-ui.changes 2017-07-23 12:15:09.565307203 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-servant-swagger-ui.new/ghc-servant-swagger-ui.changes 2017-08-31 20:59:33.285356654 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:05:43 UTC 2017 - psimons(a)suse.com + +- Update to version 0.2.4.3.0.20. + +------------------------------------------------------------------- Old: ---- servant-swagger-ui-0.2.3.2.2.8.tar.gz servant-swagger-ui.cabal New: ---- servant-swagger-ui-0.2.4.3.0.20.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-servant-swagger-ui.spec ++++++ --- /var/tmp/diff_new_pack.MCY1au/_old 2017-08-31 20:59:34.361205494 +0200 +++ /var/tmp/diff_new_pack.MCY1au/_new 2017-08-31 20:59:34.393200999 +0200 @@ -19,14 +19,13 @@ %global pkg_name servant-swagger-ui %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.2.3.2.2.8 +Version: 0.2.4.3.0.20 Release: 0 Summary: Servant swagger ui 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}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel @@ -72,7 +71,6 @@ %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ servant-swagger-ui-0.2.3.2.2.8.tar.gz -> servant-swagger-ui-0.2.4.3.0.20.tar.gz ++++++ ++++ 26671 lines of diff (skipped)

1 0

commit ghc-servant-swagger for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-servant-swagger for openSUSE:Factory checked in at 2017-08-31 20:59:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-servant-swagger (Old) and /work/SRC/openSUSE:Factory/.ghc-servant-swagger.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-servant-swagger" Thu Aug 31 20:59:30 2017 rev:2 rq:513492 version:1.1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-servant-swagger/ghc-servant-swagger.changes 2017-05-10 20:47:42.302659077 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-servant-swagger.new/ghc-servant-swagger.changes 2017-08-31 20:59:31.537602218 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:55 UTC 2017 - psimons(a)suse.com + +- Update to version 1.1.3.1. + +------------------------------------------------------------------- Old: ---- servant-swagger-1.1.2.tar.gz servant-swagger.cabal New: ---- servant-swagger-1.1.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-servant-swagger.spec ++++++ --- /var/tmp/diff_new_pack.0mG8Pv/_old 2017-08-31 20:59:32.889412285 +0200 +++ /var/tmp/diff_new_pack.0mG8Pv/_new 2017-08-31 20:59:32.893411723 +0200 @@ -19,18 +19,18 @@ %global pkg_name servant-swagger %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.1.2 +Version: 1.1.3.1 Release: 0 Summary: Generate Swagger specification for your servant API 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}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-cabal-doctest-devel BuildRequires: ghc-hspec-devel BuildRequires: ghc-http-media-devel BuildRequires: ghc-insert-ordered-containers-devel @@ -66,7 +66,6 @@ %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ servant-swagger-1.1.2.tar.gz -> servant-swagger-1.1.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-swagger-1.1.2/CHANGELOG.md new/servant-swagger-1.1.3.1/CHANGELOG.md --- old/servant-swagger-1.1.2/CHANGELOG.md 2016-09-13 08:58:34.000000000 +0200 +++ new/servant-swagger-1.1.3.1/CHANGELOG.md 2017-07-15 00:09:54.000000000 +0200 @@ -1,3 +1,21 @@ +1.1.3.1 +--- + +* Notes: + * GHC-8.2 compatible release + +1.1.3 +--- + +* Notes: + * `servant-0.11` compatible release + +1.1.2.1 +--- + +* Notes: + * `servant-0.10` compatible release + 1.1.2 --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-swagger-1.1.2/Setup.hs new/servant-swagger-1.1.3.1/Setup.hs --- old/servant-swagger-1.1.2/Setup.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/servant-swagger-1.1.3.1/Setup.hs 2017-07-15 00:09:54.000000000 +0200 @@ -0,0 +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/servant-swagger-1.1.2/Setup.lhs new/servant-swagger-1.1.3.1/Setup.lhs --- old/servant-swagger-1.1.2/Setup.lhs 2016-09-13 08:58:34.000000000 +0200 +++ new/servant-swagger-1.1.3.1/Setup.lhs 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -#!/usr/bin/runhaskell -\begin{code} -{-# OPTIONS_GHC -Wall #-} -module Main (main) where - -import Data.List ( nub ) -import Data.Version ( showVersion ) -import Distribution.Package ( PackageName(PackageName), PackageId, InstalledPackageId, packageVersion, packageName ) -import Distribution.PackageDescription ( PackageDescription(), TestSuite(..) ) -import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks ) -import Distribution.Simple.Utils ( rewriteFile, createDirectoryIfMissingVerbose ) -import Distribution.Simple.BuildPaths ( autogenModulesDir ) -import Distribution.Simple.Setup ( BuildFlags(buildVerbosity), fromFlag ) -import Distribution.Simple.LocalBuildInfo ( withLibLBI, withTestLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps) ) -import Distribution.Verbosity ( Verbosity ) -import System.FilePath ( (</>) ) - -main :: IO () -main = defaultMainWithHooks simpleUserHooks - { buildHook = \pkg lbi hooks flags -> do - generateBuildModule (fromFlag (buildVerbosity flags)) pkg lbi - buildHook simpleUserHooks pkg lbi hooks flags - } - -generateBuildModule :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO () -generateBuildModule verbosity pkg lbi = do - let dir = autogenModulesDir lbi - createDirectoryIfMissingVerbose verbosity True dir - withLibLBI pkg lbi $ \_ libcfg -> do - withTestLBI pkg lbi $ \suite suitecfg -> do - rewriteFile (dir </> "Build_" ++ testName suite ++ ".hs") $ unlines - [ "module Build_" ++ testName suite ++ " where" - , "" - , "autogen_dir :: String" - , "autogen_dir = " ++ show dir - , "" - , "deps :: [String]" - , "deps = " ++ (show $ formatdeps (testDeps libcfg suitecfg)) - ] - where - formatdeps = map (formatone . snd) - formatone p = case packageName p of - PackageName n -> n ++ "-" ++ showVersion (packageVersion p) - -testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [(InstalledPackageId, PackageId)] -testDeps xs ys = nub $ componentPackageDeps xs ++ componentPackageDeps ys - -\end{code} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-swagger-1.1.2/servant-swagger.cabal new/servant-swagger-1.1.3.1/servant-swagger.cabal --- old/servant-swagger-1.1.2/servant-swagger.cabal 2016-09-13 08:58:34.000000000 +0200 +++ new/servant-swagger-1.1.3.1/servant-swagger.cabal 2017-07-15 00:09:54.000000000 +0200 @@ -1,5 +1,5 @@ name: servant-swagger -version: 1.1.2 +version: 1.1.3.1 synopsis: Generate Swagger specification for your servant API. description: Please see README.md homepage: https://github.com/haskell-servant/servant-swagger @@ -12,6 +12,11 @@ category: 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.1 extra-source-files: README.md , CHANGELOG.md @@ -29,6 +34,12 @@ type: git location: https://github.com/haskell-servant/servant-swagger.git +custom-setup + setup-depends: + base >=4.7 && <4.11, + Cabal >= 1.18 && <2.1, + cabal-doctest >=1.0.2 && <1.1 + library ghc-options: -Wall exposed-modules: @@ -44,13 +55,13 @@ Servant.Swagger.Internal.TypeLevel.Every Servant.Swagger.Internal.TypeLevel.TMap hs-source-dirs: src - build-depends: aeson >=0.11.2.0 && <1.1 - , base >=4.7.0.0 && <4.10 + build-depends: aeson >=0.11.2.0 && <1.3 + , base >=4.7.0.0 && <4.11 , bytestring >=0.10.4.0 && <0.11 - , http-media >=0.6.3 && <0.7 + , http-media >=0.6.3 && <0.8 , insert-ordered-containers >=0.1.0.0 && <0.3 - , lens >=4.7.0.1 && <4.15 - , servant >=0.5 && <0.9 + , lens >=4.7.0.1 && <4.16 + , servant >=0.5 && <0.12 , swagger2 >=2.1 && <2.2 , text >=1.2.0.6 && <1.3 , unordered-containers >=0.2.5.1 && <0.3 @@ -64,11 +75,13 @@ build-depends: base, directory >= 1.0, - doctest >= 0.11 && <0.12, + doctest >= 0.11.1 && <0.12, + servant >= 0.10, + QuickCheck, filepath default-language: Haskell2010 hs-source-dirs: test - main-is: DocTest.hs + main-is: doctests.hs type: exitcode-stdio-1.0 test-suite spec @@ -82,7 +95,7 @@ , hspec , QuickCheck , lens - , servant + , servant >= 0.10 , servant-swagger , swagger2 , text diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-swagger-1.1.2/src/Servant/Swagger/Internal.hs new/servant-swagger-1.1.3.1/src/Servant/Swagger/Internal.hs --- old/servant-swagger-1.1.2/src/Servant/Swagger/Internal.hs 2016-09-13 08:58:34.000000000 +0200 +++ new/servant-swagger-1.1.3.1/src/Servant/Swagger/Internal.hs 2017-07-15 00:09:54.000000000 +0200 @@ -71,6 +71,11 @@ instance HasSwagger Raw where toSwagger _ = mempty & paths . at "/" ?~ mempty +#if MIN_VERSION_servant(0,11,0) +instance HasSwagger EmptyAPI where + toSwagger _ = mempty +#endif + -- | All operations of sub API. -- This is similar to @'operationsOf'@ but ensures that operations -- indeed belong to the API at compile time. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-swagger-1.1.2/src/Servant/Swagger.hs new/servant-swagger-1.1.3.1/src/Servant/Swagger.hs --- old/servant-swagger-1.1.2/src/Servant/Swagger.hs 2016-09-13 08:58:34.000000000 +0200 +++ new/servant-swagger-1.1.3.1/src/Servant/Swagger.hs 2017-07-15 00:09:54.000000000 +0200 @@ -98,7 +98,7 @@ -- In order to generate @'Swagger'@ specification for a servant API, just use @'toSwagger'@: -- -- >>> BSL8.putStrLn $ encode $ toSwagger (Proxy :: Proxy UserAPI) --- {"swagger":"2.0","info":{"version":"","title":""},"paths":{"/":{"get":{"produces":["application/json"],"responses":{"200":{"schema":{"items":{"$ref":"#/definitions/User"},"type":"array"},"description":""}}},"post":{"consumes":["application/json"],"produces":["application/json"],"parameters":[{"required":true,"schema":{"$ref":"#/definitions/User"},"in":"body","name":"body"}],"responses":{"400":{"description":"Invalid `body`"},"200":{"schema":{"$ref":"#/definitions/UserId"},"description":""}}}},"/{user_id}":{"get":{"produces":["application/json"],"parameters":[{"required":true,"in":"path","name":"user_id","type":"integer"}],"responses":{"404":{"description":"`user_id` not found"},"200":{"schema":{"$ref":"#/definitions/User"},"description":""}}}}},"definitions":{"User":{"required":["name","age"],"properties":{"name":{"type":"string"},"age":{"maximum":9223372036854775807,"minimum":-9223372036854775808,"type":"integer"}},"type":"object"},"UserId":{"type":"integer"}}} +-- {"swagger":"2.0","info":{"version":"","title":""},"paths":{"/":{"get":{"produces":["application/json;charset=utf-8"],"responses":{"200":{"schema":{"items":{"$ref":"#/definitions/User"},"type":"array"},"description":""}}},"post":{"consumes":["application/json;charset=utf-8"],"produces":["application/json;charset=utf-8"],"parameters":[{"required":true,"schema":{"$ref":"#/definitions/User"},"in":"body","name":"body"}],"responses":{"400":{"description":"Invalid `body`"},"200":{"schema":{"$ref":"#/definitions/UserId"},"description":""}}}},"/{user_id}":{"get":{"produces":["application/json;charset=utf-8"],"parameters":[{"required":true,"in":"path","name":"user_id","type":"integer"}],"responses":{"404":{"description":"`user_id` not found"},"200":{"schema":{"$ref":"#/definitions/User"},"description":""}}}}},"definitions":{"User":{"required":["name","age"],"properties":{"name":{"type":"string"},"age":{"maximum":9223372036854775807,"minimum":-9223372036854775808,"type":"integer"}},"type":"object"},"UserId":{"type":"integer"}}} -- -- By default @'toSwagger'@ will generate specification for all API routes, parameters, headers, responses and data schemas. -- @@ -119,7 +119,7 @@ -- & info.license ?~ "MIT" -- & host ?~ "example.com" -- :} --- {"swagger":"2.0","info":{"version":"1.0","title":"User API","license":{"name":"MIT"},"description":"This is an API for the Users service"},"host":"example.com","paths":{"/":{"get":{"produces":["application/json"],"responses":{"200":{"schema":{"items":{"$ref":"#/definitions/User"},"type":"array"},"description":""}}},"post":{"consumes":["application/json"],"produces":["application/json"],"parameters":[{"required":true,"schema":{"$ref":"#/definitions/User"},"in":"body","name":"body"}],"responses":{"400":{"description":"Invalid `body`"},"200":{"schema":{"$ref":"#/definitions/UserId"},"description":""}}}},"/{user_id}":{"get":{"produces":["application/json"],"parameters":[{"required":true,"in":"path","name":"user_id","type":"integer"}],"responses":{"404":{"description":"`user_id` not found"},"200":{"schema":{"$ref":"#/definitions/User"},"description":""}}}}},"definitions":{"User":{"required":["name","age"],"properties":{"name":{"type":"string"},"age":{"maximum":9223372036854775807,"minimum":-9223372036854775808,"type":"integer"}},"type":"object"},"UserId":{"type":"integer"}}} +-- {"swagger":"2.0","info":{"version":"1.0","title":"User API","license":{"name":"MIT"},"description":"This is an API for the Users service"},"host":"example.com","paths":{"/":{"get":{"produces":["application/json;charset=utf-8"],"responses":{"200":{"schema":{"items":{"$ref":"#/definitions/User"},"type":"array"},"description":""}}},"post":{"consumes":["application/json;charset=utf-8"],"produces":["application/json;charset=utf-8"],"parameters":[{"required":true,"schema":{"$ref":"#/definitions/User"},"in":"body","name":"body"}],"responses":{"400":{"description":"Invalid `body`"},"200":{"schema":{"$ref":"#/definitions/UserId"},"description":""}}}},"/{user_id}":{"get":{"produces":["application/json;charset=utf-8"],"parameters":[{"required":true,"in":"path","name":"user_id","type":"integer"}],"responses":{"404":{"description":"`user_id` not found"},"200":{"schema":{"$ref":"#/definitions/User"},"description":""}}}}},"definitions":{"User":{"required":["name","age"],"properties":{"name":{"type":"string"},"age":{"maximum":9223372036854775807,"minimum":-9223372036854775808,"type":"integer"}},"type":"object"},"UserId":{"type":"integer"}}} -- -- It is also useful to annotate or modify certain endpoints. -- @'subOperations'@ provides a convenient way to zoom into a part of an API. @@ -137,7 +137,7 @@ -- & applyTagsFor getOps ["get" & description ?~ "GET operations"] -- & applyTagsFor postOps ["post" & description ?~ "POST operations"] -- :} --- {"swagger":"2.0","info":{"version":"","title":""},"paths":{"/":{"get":{"tags":["get"],"produces":["application/json"],"responses":{"200":{"schema":{"items":{"$ref":"#/definitions/User"},"type":"array"},"description":""}}},"post":{"tags":["post"],"consumes":["application/json"],"produces":["application/json"],"parameters":[{"required":true,"schema":{"$ref":"#/definitions/User"},"in":"body","name":"body"}],"responses":{"400":{"description":"Invalid `body`"},"200":{"schema":{"$ref":"#/definitions/UserId"},"description":""}}}},"/{user_id}":{"get":{"tags":["get"],"produces":["application/json"],"parameters":[{"required":true,"in":"path","name":"user_id","type":"integer"}],"responses":{"404":{"description":"`user_id` not found"},"200":{"schema":{"$ref":"#/definitions/User"},"description":""}}}}},"definitions":{"User":{"required":["name","age"],"properties":{"name":{"type":"string"},"age":{"maximum":9223372036854775807,"minimum":-9223372036854775808,"type":"integer"}},"type":"object"},"UserId":{"type":"integer"}},"tags":[{"name":"get","description":"GET operations"},{"name":"post","description":"POST operations"}]} +-- {"swagger":"2.0","info":{"version":"","title":""},"paths":{"/":{"get":{"tags":["get"],"produces":["application/json;charset=utf-8"],"responses":{"200":{"schema":{"items":{"$ref":"#/definitions/User"},"type":"array"},"description":""}}},"post":{"tags":["post"],"consumes":["application/json;charset=utf-8"],"produces":["application/json;charset=utf-8"],"parameters":[{"required":true,"schema":{"$ref":"#/definitions/User"},"in":"body","name":"body"}],"responses":{"400":{"description":"Invalid `body`"},"200":{"schema":{"$ref":"#/definitions/UserId"},"description":""}}}},"/{user_id}":{"get":{"tags":["get"],"produces":["application/json;charset=utf-8"],"parameters":[{"required":true,"in":"path","name":"user_id","type":"integer"}],"responses":{"404":{"description":"`user_id` not found"},"200":{"schema":{"$ref":"#/definitions/User"},"description":""}}}}},"definitions":{"User":{"required":["name","age"],"properties":{"name":{"type":"string"},"age":{"maximum":9223372036854775807,"minimum":-9223372036854775808,"type":"integer"}},"type":"object"},"UserId":{"type":"integer"}},"tags":[{"name":"get","description":"GET operations"},{"name":"post","description":"POST operations"}]} -- -- This applies @\"get\"@ tag to the @GET@ endpoints and @\"post\"@ tag to the @POST@ endpoint of the User API. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-swagger-1.1.2/test/DocTest.hs new/servant-swagger-1.1.3.1/test/DocTest.hs --- old/servant-swagger-1.1.2/test/DocTest.hs 2016-09-13 08:58:34.000000000 +0200 +++ new/servant-swagger-1.1.3.1/test/DocTest.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -module Main where - -import Build_doctests (autogen_dir, deps) -import Control.Applicative -import Control.Monad -import Data.List -import System.Directory -import System.FilePath -import Test.DocTest - -main :: IO () -main = getSources >>= \sources -> doctest $ - "-isrc" - : ("-i" ++ autogen_dir) - : "-optP-include" - : ("-optP" ++ autogen_dir ++ "/cabal_macros.h") - : "-hide-all-packages" - : map ("-package="++) deps ++ sources - -getSources :: IO [FilePath] -getSources = filter (isSuffixOf ".hs") <$> go "src" - where - go dir = do - (dirs, files) <- getFilesAndDirectories dir - (files ++) . concat <$> mapM go dirs - -getFilesAndDirectories :: FilePath -> IO ([FilePath], [FilePath]) -getFilesAndDirectories dir = do - c <- map (dir </>) . filter (`notElem` ["..", "."]) <$> getDirectoryContents dir - (,) <$> filterM doesDirectoryExist c <*> filterM doesFileExist c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-swagger-1.1.2/test/Servant/SwaggerSpec.hs new/servant-swagger-1.1.3.1/test/Servant/SwaggerSpec.hs --- old/servant-swagger-1.1.2/test/Servant/SwaggerSpec.hs 2016-09-13 08:58:34.000000000 +0200 +++ new/servant-swagger-1.1.3.1/test/Servant/SwaggerSpec.hs 2017-07-15 00:09:54.000000000 +0200 @@ -102,7 +102,7 @@ }, "404": { "description": "`id` not found" } }, - "produces": [ "application/json" ], + "produces": [ "application/json;charset=utf-8" ], "parameters": [ { @@ -259,7 +259,7 @@ } }, "produces":[ - "application/json" + "application/json;charset=utf-8" ], "tags":[ "users" @@ -280,7 +280,7 @@ } }, "produces":[ - "application/json" + "application/json;charset=utf-8" ], "tags":[ "packages" @@ -301,7 +301,7 @@ } }, "produces":[ - "application/json" + "application/json;charset=utf-8" ], "parameters":[ { @@ -363,7 +363,7 @@ "description":"" } }, - "produces":[ "application/json" ] + "produces":[ "application/json;charset=utf-8" ] }, "get":{ "responses":{ @@ -374,7 +374,7 @@ "description":"" } }, - "produces":[ "application/json" ], + "produces":[ "application/json;charset=utf-8" ], "tags":[ "get" ] } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-swagger-1.1.2/test/doctests.hs new/servant-swagger-1.1.3.1/test/doctests.hs --- old/servant-swagger-1.1.2/test/doctests.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/servant-swagger-1.1.3.1/test/doctests.hs 2017-07-15 00:09:54.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

1 0

commit ghc-servant-subscriber for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-servant-subscriber for openSUSE:Factory checked in at 2017-08-31 20:59:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-servant-subscriber (Old) and /work/SRC/openSUSE:Factory/.ghc-servant-subscriber.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-servant-subscriber" Thu Aug 31 20:59:28 2017 rev:2 rq:513491 version:0.6.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-servant-subscriber/ghc-servant-subscriber.changes 2017-05-10 20:50:55.331421254 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-servant-subscriber.new/ghc-servant-subscriber.changes 2017-08-31 20:59:28.278060193 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:59 UTC 2017 - psimons(a)suse.com + +- Update to version 0.6.0.0 revision 1. + +------------------------------------------------------------------- Old: ---- servant-subscriber-0.5.0.3.tar.gz New: ---- servant-subscriber-0.6.0.0.tar.gz servant-subscriber.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-servant-subscriber.spec ++++++ --- /var/tmp/diff_new_pack.29lLE4/_old 2017-08-31 20:59:29.225927015 +0200 +++ /var/tmp/diff_new_pack.29lLE4/_new 2017-08-31 20:59:29.233925891 +0200 @@ -18,13 +18,14 @@ %global pkg_name servant-subscriber Name: ghc-%{pkg_name} -Version: 0.5.0.3 +Version: 0.6.0.0 Release: 0 Summary: When REST is not enough 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}-%{ve… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel @@ -77,6 +78,7 @@ %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ servant-subscriber-0.5.0.3.tar.gz -> servant-subscriber-0.6.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-subscriber-0.5.0.3/servant-subscriber.cabal new/servant-subscriber-0.6.0.0/servant-subscriber.cabal --- old/servant-subscriber-0.5.0.3/servant-subscriber.cabal 2016-10-19 21:03:39.000000000 +0200 +++ new/servant-subscriber-0.6.0.0/servant-subscriber.cabal 2017-02-15 17:31:47.000000000 +0100 @@ -1,5 +1,5 @@ name: servant-subscriber -version: 0.5.0.3 +version: 0.6.0.0 synopsis: When REST is not enough ... description: Please see Readme.md homepage: http://github.com/eskimor/servant-subscriber#readme diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/servant-subscriber-0.5.0.3/src/Servant/Subscriber/Subscribable.hs new/servant-subscriber-0.6.0.0/src/Servant/Subscriber/Subscribable.hs --- old/servant-subscriber-0.5.0.3/src/Servant/Subscriber/Subscribable.hs 2016-08-16 14:44:24.000000000 +0200 +++ new/servant-subscriber-0.6.0.0/src/Servant/Subscriber/Subscribable.hs 2017-02-15 17:31:47.000000000 +0100 @@ -90,15 +90,3 @@ instance HasLink sub => HasLink (Subscribable :> sub) where type MkLink (Subscribable :> sub) = MkLink sub toLink _ = toLink (Proxy :: Proxy sub) - --------------- Copied from Servant.Util.Links (they are not exported) ---------- - --- | If both a or b produce an empty constraint, produce an empty constraint. -type family And (a :: Constraint) (b :: Constraint) :: Constraint where - And () () = () - -type family Elem e es :: Constraint where - Elem x (x ': xs) = () - Elem y (x ': xs) = Elem y xs - --------------------------------------------------------------------------------- ++++++ servant-subscriber.cabal ++++++ name: servant-subscriber version: 0.6.0.0 x-revision: 1 synopsis: When REST is not enough ... description: Please see Readme.md homepage: http://github.com/eskimor/servant-subscriber#readme license: BSD3 license-file: LICENSE author: Robert Klotzner maintainer: robert Dot klotzner A T gmx Dot at copyright: Copyright: (c) 2016 Robert Klotzner category: Web build-type: Simple extra-source-files: Readme.md cabal-version: >=1.10 extra-source-files: Readme.md library hs-source-dirs: src exposed-modules: Servant.Subscriber , Servant.Subscriber.Backend , Servant.Subscriber.Backend.Wai , Servant.Subscriber.Client , Servant.Subscriber.Request , Servant.Subscriber.Response , Servant.Subscriber.Subscribable , Servant.Subscriber.Types build-depends: base >= 4.7 && < 6.0 , aeson >= 0.11.2 , async , attoparsec , blaze-builder , bytestring , case-insensitive , containers , directory >= 1.2.2.0 , filepath , http-types , lens , lifted-base , monad-control , monad-logger , network-uri , servant , servant-foreign , servant-server , stm , text , time , transformers , wai , wai-websockets , warp , websockets < 0.11 default-language: Haskell2010 executable subscriber-psGenerator hs-source-dirs: app main-is: PSGenerator.hs ghc-options: -threaded -rtsopts -with-rtsopts=-N build-depends: base , servant-subscriber , purescript-bridge >= 0.6 default-language: Haskell2010 source-repository head type: git location: https://github.com/eskimor/servant-subscriber

1 0

commit ghc-servant-server for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-servant-server for openSUSE:Factory checked in at 2017-08-31 20:59:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-servant-server (Old) and /work/SRC/openSUSE:Factory/.ghc-servant-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-servant-server" Thu Aug 31 20:59:26 2017 rev:2 rq:513490 version:0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-servant-server/ghc-servant-server.changes 2017-05-10 20:50:45.640788695 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-servant-server.new/ghc-servant-server.changes 2017-08-31 20:59:26.366328796 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:02 UTC 2017 - psimons(a)suse.com + +- Update to version 0.11 revision 1. + +------------------------------------------------------------------- Old: ---- servant-server-0.9.1.1.tar.gz New: ---- servant-server-0.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-servant-server.spec ++++++ --- /var/tmp/diff_new_pack.OElymM/_old 2017-08-31 20:59:27.486171455 +0200 +++ /var/tmp/diff_new_pack.OElymM/_new 2017-08-31 20:59:27.506168645 +0200 @@ -19,7 +19,7 @@ %global pkg_name servant-server %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.9.1.1 +Version: 0.11 Release: 0 Summary: A family of combinators for defining webservices APIs and serving them License: BSD-3-Clause @@ -34,20 +34,26 @@ BuildRequires: ghc-base-compat-devel BuildRequires: ghc-base64-bytestring-devel BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-cabal-doctest-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-exceptions-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-http-api-data-devel BuildRequires: ghc-http-types-devel +BuildRequires: ghc-monad-control-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel BuildRequires: ghc-network-uri-devel +BuildRequires: ghc-resourcet-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-safe-devel BuildRequires: ghc-servant-devel BuildRequires: ghc-split-devel BuildRequires: ghc-string-conversions-devel BuildRequires: ghc-system-filepath-devel +BuildRequires: ghc-tagged-devel BuildRequires: ghc-text-devel +BuildRequires: ghc-transformers-base-devel BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-wai-app-static-devel @@ -59,7 +65,6 @@ BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-doctest-devel -BuildRequires: ghc-exceptions-devel BuildRequires: ghc-filemanip-devel BuildRequires: ghc-hspec-devel BuildRequires: ghc-hspec-wai-devel ++++++ servant-server-0.9.1.1.tar.gz -> servant-server-0.11.tar.gz ++++++ ++++ 1750 lines of diff (skipped) ++++++ servant-server.cabal ++++++ --- /var/tmp/diff_new_pack.OElymM/_old 2017-08-31 20:59:28.102084917 +0200 +++ /var/tmp/diff_new_pack.OElymM/_new 2017-08-31 20:59:28.138079860 +0200 @@ -1,5 +1,5 @@ name: servant-server -version: 0.9.1.1 +version: 0.11 x-revision: 1 synopsis: A family of combinators for defining webservices APIs and serving them description: @@ -19,8 +19,8 @@ author: Servant Contributors maintainer: haskell-servant-maintainers(a)googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, Servant Contributors -category: Web -build-type: Simple +category: Servant Web +build-type: Custom cabal-version: >=1.10 tested-with: GHC >= 7.8 extra-source-files: @@ -32,6 +32,11 @@ type: git location: http://github.com/haskell-servant/servant.git +custom-setup + setup-depends: + base >= 4 && <5, + Cabal, + cabal-doctest >= 1.0.1 && <1.1 library exposed-modules: @@ -41,31 +46,37 @@ Servant.Server.Internal Servant.Server.Internal.BasicAuth Servant.Server.Internal.Context + Servant.Server.Internal.Handler Servant.Server.Internal.Router Servant.Server.Internal.RoutingApplication Servant.Server.Internal.ServantErr Servant.Utils.StaticFiles build-depends: - base >= 4.7 && < 4.10 + base >= 4.7 && < 4.11 , base-compat >= 0.9 && < 0.10 - , aeson >= 0.7 && < 1.2 + , aeson >= 0.7 && < 1.3 , attoparsec >= 0.12 && < 0.14 , base64-bytestring >= 1.0 && < 1.1 , bytestring >= 0.10 && < 0.11 , containers >= 0.5 && < 0.6 + , exceptions >= 0.8 && < 0.9 , http-api-data >= 0.3 && < 0.4 , http-types >= 0.8 && < 0.10 , network-uri >= 2.6 && < 2.7 + , monad-control >= 1.0.0.4 && < 1.1 , mtl >= 2 && < 2.3 , network >= 2.6 && < 2.7 , safe >= 0.3 && < 0.4 - , servant == 0.9.* + , servant == 0.11.* , split >= 0.2 && < 0.3 , string-conversions >= 0.3 && < 0.5 , system-filepath >= 0.4 && < 0.5 , filepath >= 1 && < 1.5 + , resourcet >= 1.1.6 && <1.2 + , tagged >= 0.7.3 && <0.9 , text >= 1.2 && < 1.3 , transformers >= 0.3 && < 0.6 + , transformers-base >= 0.4.4 && < 0.5 , transformers-compat>= 0.4 && < 0.6 , wai >= 3.0 && < 3.3 , wai-app-static >= 3.1 && < 3.2 @@ -103,6 +114,7 @@ Servant.ArbitraryMonadServerSpec Servant.Server.ErrorSpec Servant.Server.Internal.ContextSpec + Servant.Server.Internal.RoutingApplicationSpec Servant.Server.RouterSpec Servant.Server.StreamingSpec Servant.Server.UsingContextSpec @@ -118,21 +130,22 @@ , directory , exceptions , hspec == 2.* - , hspec-wai + , hspec-wai >= 0.8 && <0.9 , http-types + , mtl , network >= 2.6 - , QuickCheck , parsec + , QuickCheck + , resourcet , safe , servant , servant-server - , string-conversions , should-not-typecheck == 2.1.* + , string-conversions , temporary , text , transformers , transformers-compat - , mtl , wai , wai-extra , warp @@ -145,8 +158,10 @@ , directory , filepath type: exitcode-stdio-1.0 - main-is: test/Doctests.hs + 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

1 0