Hello community, here is the log from the commit of package yackage for openSUSE:Factory checked in at 2017-03-24 02:17:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yackage (Old) and /work/SRC/openSUSE:Factory/.yackage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yackage" Fri Mar 24 02:17:04 2017 rev:2 rq:477662 version:0.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yackage/yackage.changes 2017-02-28 23:48:14.301015256 +0100 +++ /work/SRC/openSUSE:Factory/.yackage.new/yackage.changes 2017-03-24 02:17:07.686492102 +0100 @@ -1,0 +2,5 @@ +Mon Oct 17 15:37:33 UTC 2016 - psimons@suse.com + +- Update to version 0.8.1 with cabal2obs. + +------------------------------------------------------------------- Old: ---- yackage-0.8.0.tar.gz New: ---- yackage-0.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yackage.spec ++++++ --- /var/tmp/diff_new_pack.GGWDVL/_old 2017-03-24 02:17:08.158425328 +0100 +++ /var/tmp/diff_new_pack.GGWDVL/_new 2017-03-24 02:17:08.162424763 +0100 @@ -1,7 +1,7 @@ # # spec file for package yackage # -# 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,7 +17,7 @@ Name: yackage -Version: 0.8.0 +Version: 0.8.1 Release: 0 Summary: Personal Hackage replacement for testing new packages License: BSD-3-Clause @@ -25,6 +25,7 @@ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-aeson-devel BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-bytestring-devel ++++++ yackage-0.8.0.tar.gz -> yackage-0.8.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yackage-0.8.0/ChangeLog.md new/yackage-0.8.1/ChangeLog.md --- old/yackage-0.8.0/ChangeLog.md 2015-08-11 15:23:07.000000000 +0200 +++ new/yackage-0.8.1/ChangeLog.md 2016-10-13 05:51:59.000000000 +0200 @@ -1,3 +1,7 @@ +## 0.8.1 + +* aeson 1.0 + ## 0.8.0 * Warp 3.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yackage-0.8.0/yackage.cabal new/yackage-0.8.1/yackage.cabal --- old/yackage-0.8.0/yackage.cabal 2015-08-11 15:23:07.000000000 +0200 +++ new/yackage-0.8.1/yackage.cabal 2016-10-13 05:51:59.000000000 +0200 @@ -1,5 +1,5 @@ Name: yackage -Version: 0.8.0 +Version: 0.8.1 Synopsis: Personal Hackage replacement for testing new packages. description: Hackage documentation generation is not reliable. For up to date documentation, please see: http://www.stackage.org/package/yackage. Homepage: http://github.com/snoyberg/yackage @@ -29,6 +29,7 @@ , containers , directory , yaml + , aeson , cmdargs , wai >= 1.4 , transformers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yackage-0.8.0/yackage.hs new/yackage-0.8.1/yackage.hs --- old/yackage-0.8.0/yackage.hs 2015-08-11 15:23:07.000000000 +0200 +++ new/yackage-0.8.1/yackage.hs 2016-10-13 05:51:59.000000000 +0200 @@ -6,6 +6,9 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE ViewPatterns #-} +{-# LANGUAGE CPP #-} +{-# LANGUAGE StandaloneDeriving #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} import Yesod.Core import Yesod.Form import Text.Hamlet @@ -44,6 +47,9 @@ import qualified Data.Vector as Vector import Data.Conduit (($$)) import Data.Conduit.List (consume) +#if MIN_VERSION_aeson(1,0,0) +import qualified Data.Aeson as A +#endif data Args = Args { port :: Int @@ -261,6 +267,10 @@ go (pn, vs) = toPathPiece pn .= array (map go' $ Set.toList vs) go' = String . toPathPiece +#if MIN_VERSION_aeson(1,0,0) +deriving instance FromJSON PackageName +deriving instance A.FromJSONKey PackageName +#else instance FromJSON PackageDB where parseJSON (Object o) = do fmap Map.fromList $ mapM go $ HMap.toList o @@ -275,3 +285,4 @@ return x go' _ = fail "parseConfig.go'" parseJSON _ = fail "parseConfig" +#endif