Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-yesod for openSUSE:Factory checked in at 2026-06-22 17:44:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yesod (Old) and /work/SRC/openSUSE:Factory/.ghc-yesod.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-yesod" Mon Jun 22 17:44:15 2026 rev:12 rq:1361108 version:1.6.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yesod/ghc-yesod.changes 2023-04-04 21:25:19.654864455 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-yesod.new.1956/ghc-yesod.changes 2026-06-22 17:44:48.194067965 +0200 @@ -1,0 +2,12 @@ +Tue Jun 16 20:34:36 UTC 2026 - Peter Simons <[email protected]> + +- Update yesod to version 1.6.2.3. + ## 1.6.2.3 + + * Support `yesod-core` 1.7 + + ## 1.6.2.2 + + * Set `base >= 4.11` for less CPP and imports [#1876](https://github.com/yesodweb/yesod/pull/1876) + +------------------------------------------------------------------- Old: ---- yesod-1.6.2.1.tar.gz New: ---- yesod-1.6.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yesod.spec ++++++ --- /var/tmp/diff_new_pack.nqgHbD/_old 2026-06-22 17:44:49.458112268 +0200 +++ /var/tmp/diff_new_pack.nqgHbD/_new 2026-06-22 17:44:49.458112268 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-yesod # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2026 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name yesod %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.6.2.1 +Version: 1.6.2.3 Release: 0 Summary: Creation of type-safe, RESTful web applications License: MIT ++++++ yesod-1.6.2.1.tar.gz -> yesod-1.6.2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-1.6.2.1/ChangeLog.md new/yesod-1.6.2.3/ChangeLog.md --- old/yesod-1.6.2.1/ChangeLog.md 2022-09-08 13:21:18.000000000 +0200 +++ new/yesod-1.6.2.3/ChangeLog.md 2026-06-16 21:53:03.000000000 +0200 @@ -1,5 +1,13 @@ # ChangeLog for yesod +## 1.6.2.3 + +* Support `yesod-core` 1.7 + +## 1.6.2.2 + +* Set `base >= 4.11` for less CPP and imports [#1876](https://github.com/yesodweb/yesod/pull/1876) + ## 1.6.2.1 * Support `template-haskell-2.19.0.0` [#1769](https://github.com/yesodweb/yesod/pull/1769) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-1.6.2.1/Yesod/Default/Config.hs new/yesod-1.6.2.3/Yesod/Default/Config.hs --- old/yesod-1.6.2.1/Yesod/Default/Config.hs 2022-09-08 13:21:18.000000000 +0200 +++ new/yesod-1.6.2.3/Yesod/Default/Config.hs 2025-07-08 15:43:18.000000000 +0200 @@ -1,6 +1,8 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE PatternGuards #-} +{-# LANGUAGE ScopedTypeVariables #-} + module Yesod.Default.Config ( DefaultEnv (..) , fromArgs @@ -18,7 +20,15 @@ import Data.Char (toUpper) import Data.Text (Text) import qualified Data.Text as T -import Data.Yaml +import Data.Yaml ( + Object, + Parser, + Value (..), + decodeFileEither, + parseEither, + prettyPrintParseException, + (.:) + ) import Data.Maybe (fromMaybe) import System.Environment (getArgs, getProgName, getEnvironment) import System.Exit (exitFailure) @@ -44,9 +54,9 @@ , port :: Int } deriving Show -parseArgConfig :: (Show env, Read env, Enum env, Bounded env) => IO (ArgConfig env) +parseArgConfig :: forall env. (Show env, Read env, Enum env, Bounded env) => IO (ArgConfig env) parseArgConfig = do - let envs = [minBound..maxBound] + let envs = [minBound..maxBound] :: [env] args <- getArgs (portS, args') <- getPort id args portI <- @@ -57,10 +67,7 @@ [e] -> do case reads $ capitalize e of (e', _):_ -> return $ ArgConfig e' portI - [] -> do - () <- error $ "Invalid environment, valid entries are: " ++ show envs - -- next line just provided to force the type of envs - return $ ArgConfig (head envs) 0 + [] -> error $ "Invalid environment, valid entries are: " ++ show envs _ -> do pn <- getProgName putStrLn $ "Usage: " ++ pn ++ " <environment> [--port <port>]" @@ -194,7 +201,7 @@ _ -> fail "Expected map" let host = fromString $ T.unpack $ fromMaybe "*" $ lookupScalar "host" m - mport <- parseMonad (\x -> x .: "port") m + mport <- parseEitherM (\x -> x .: "port") m let approot' = fromMaybe "" $ lookupScalar "approot" m -- Handle the DISPLAY_PORT environment variable for yesod devel @@ -207,7 +214,7 @@ Nothing -> return approot' Just p -> return $ prefix `T.append` T.pack (':' : p) - extra <- parseMonad (parseExtra env) m + extra <- parseEitherM (parseExtra env) m -- set some default arguments let port' = fromMaybe 80 mport @@ -243,5 +250,9 @@ Left err -> fail $ "Invalid YAML file: " ++ show fp ++ " " ++ prettyPrintParseException err Right (Object obj) - | Just v <- M.lookup (fromString $ show env) obj -> parseMonad f v + | Just v <- M.lookup (fromString $ show env) obj -> parseEitherM f v _ -> fail $ "Could not find environment: " ++ show env + +-- | Replacement for `parseMonad` +parseEitherM :: (a -> Parser b) -> a -> IO b +parseEitherM p = either fail pure . parseEither p diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-1.6.2.1/Yesod/Default/Config2.hs new/yesod-1.6.2.3/Yesod/Default/Config2.hs --- old/yesod-1.6.2.1/Yesod/Default/Config2.hs 2022-09-08 13:21:18.000000000 +0200 +++ new/yesod-1.6.2.3/Yesod/Default/Config2.hs 2025-07-08 15:43:18.000000000 +0200 @@ -1,5 +1,6 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} + -- | Some next-gen helper functions for the scaffolding's configuration system. module Yesod.Default.Config2 ( -- * Locally defined @@ -28,7 +29,6 @@ import Data.Yaml.Config -import Data.Semigroup import Data.Aeson import System.Environment (getEnvironment) import Network.Wai (Application) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-1.6.2.1/Yesod/Default/Handlers.hs new/yesod-1.6.2.3/Yesod/Default/Handlers.hs --- old/yesod-1.6.2.1/Yesod/Default/Handlers.hs 2022-09-08 13:21:18.000000000 +0200 +++ new/yesod-1.6.2.3/Yesod/Default/Handlers.hs 2025-07-08 15:43:18.000000000 +0200 @@ -1,4 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} + module Yesod.Default.Handlers ( getFaviconR , getRobotsR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-1.6.2.1/Yesod/Default/Main.hs new/yesod-1.6.2.3/Yesod/Default/Main.hs --- old/yesod-1.6.2.1/Yesod/Default/Main.hs 2022-09-08 13:21:18.000000000 +0200 +++ new/yesod-1.6.2.3/Yesod/Default/Main.hs 2025-07-08 15:43:18.000000000 +0200 @@ -1,6 +1,7 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE CPP #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE TemplateHaskell #-} + module Yesod.Default.Main ( defaultMain , defaultMainLog @@ -46,7 +47,7 @@ defaultMain load getApp = do config <- load app <- getApp config - runSettings + runSettings ( setPort (appPort config) $ setHost (appHost config) $ defaultSettings @@ -64,7 +65,7 @@ defaultMainLog load getApp = do config <- load (app, logFunc) <- getApp config - runSettings + runSettings ( setPort (appPort config) $ setHost (appHost config) $ setOnException (const $ \e -> when (shouldLog' e) $ logFunc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-1.6.2.1/Yesod/Default/Util.hs new/yesod-1.6.2.3/Yesod/Default/Util.hs --- old/yesod-1.6.2.1/Yesod/Default/Util.hs 2022-09-08 13:21:18.000000000 +0200 +++ new/yesod-1.6.2.3/Yesod/Default/Util.hs 2025-07-08 15:43:18.000000000 +0200 @@ -1,6 +1,7 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE CPP #-} + -- | Various utilities used in the scaffolded site. module Yesod.Default.Util ( addStaticContentExternal @@ -22,7 +23,10 @@ import Control.Monad (when, unless) import Conduit import System.Directory (doesFileExist, createDirectoryIfMissing) -import Language.Haskell.TH.Syntax hiding (makeRelativeToProject) +import Language.Haskell.TH.Syntax +#if MIN_VERSION_template_haskell(2,19,0) + hiding (makeRelativeToProject) +#endif import Text.Lucius (luciusFile, luciusFileReload) import Text.Julius (juliusFile, juliusFileReload) import Text.Cassius (cassiusFile, cassiusFileReload) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-1.6.2.1/Yesod.hs new/yesod-1.6.2.3/Yesod.hs --- old/yesod-1.6.2.1/Yesod.hs 2022-09-08 13:21:18.000000000 +0200 +++ new/yesod-1.6.2.3/Yesod.hs 2025-07-08 15:43:18.000000000 +0200 @@ -1,5 +1,3 @@ -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE CPP #-} -- | This module simply re-exports from other modules for your convenience. module Yesod ( -- * Re-exports from yesod-core diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-1.6.2.1/yesod.cabal new/yesod-1.6.2.3/yesod.cabal --- old/yesod-1.6.2.1/yesod.cabal 2022-09-08 13:21:18.000000000 +0200 +++ new/yesod-1.6.2.3/yesod.cabal 2026-06-16 21:53:03.000000000 +0200 @@ -1,5 +1,5 @@ name: yesod -version: 1.6.2.1 +version: 1.6.2.3 license: MIT license-file: LICENSE author: Michael Snoyman <[email protected]> @@ -18,14 +18,14 @@ if os(windows) cpp-options: -DWINDOWS - build-depends: base >= 4.10 && < 5 + build-depends: base >= 4.11 && < 5 , aeson , bytestring , conduit >= 1.3 , data-default-class , directory , fast-logger - , file-embed + , file-embed >= 0.0.10 , monad-logger , shakespeare , streaming-commons @@ -37,7 +37,7 @@ , wai-logger , warp >= 1.3 , yaml >= 0.8.17 - , yesod-core >= 1.6 && < 1.7 + , yesod-core >= 1.6 && < 1.8 , yesod-form >= 1.6 && < 1.8 , yesod-persistent >= 1.6 && < 1.7
