Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-yesod-static for
openSUSE:Factory checked in at 2026-06-10 16:10:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-yesod-static (Old)
and /work/SRC/openSUSE:Factory/.ghc-yesod-static.new.2375 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-yesod-static"
Wed Jun 10 16:10:21 2026 rev:6 rq:1358479 version:1.6.1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-yesod-static/ghc-yesod-static.changes
2023-04-04 21:25:23.526886434 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-yesod-static.new.2375/ghc-yesod-static.changes
2026-06-10 16:15:49.237078464 +0200
@@ -1,0 +2,13 @@
+Tue Jan 20 21:19:49 UTC 2026 - Peter Simons <[email protected]>
+
+- Update yesod-static to version 1.6.1.2.
+ ## 1.6.1.2
+
+ * Allow JavaScript MIME type used by `mime-types >= 0.1.2.1` in test suite
[#1898](https://github.com/yesodweb/yesod/pull/1898)
+
+ ## 1.6.1.1
+
+ * Use crypton instead of cryptonite
[#1838](https://github.com/yesodweb/yesod/pull/1838)
+ * Set `base >= 4.11` for less CPP and imports
[#1876](https://github.com/yesodweb/yesod/pull/1876)
+
+-------------------------------------------------------------------
Old:
----
yesod-static-1.6.1.0.tar.gz
New:
----
yesod-static-1.6.1.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-yesod-static.spec ++++++
--- /var/tmp/diff_new_pack.ndqb1g/_old 2026-06-10 16:15:50.845145103 +0200
+++ /var/tmp/diff_new_pack.ndqb1g/_new 2026-06-10 16:15:50.849145269 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-yesod-static
#
-# 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
@@ -20,7 +20,7 @@
%global pkgver %{pkg_name}-%{version}
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 1.6.1.0
+Version: 1.6.1.2
Release: 0
Summary: Static file serving subsite for Yesod Web Framework
License: MIT
@@ -43,10 +43,10 @@
BuildRequires: ghc-conduit-prof
BuildRequires: ghc-containers-devel
BuildRequires: ghc-containers-prof
-BuildRequires: ghc-cryptonite-conduit-devel
-BuildRequires: ghc-cryptonite-conduit-prof
-BuildRequires: ghc-cryptonite-devel
-BuildRequires: ghc-cryptonite-prof
+BuildRequires: ghc-crypton-conduit-devel
+BuildRequires: ghc-crypton-conduit-prof
+BuildRequires: ghc-crypton-devel
+BuildRequires: ghc-crypton-prof
BuildRequires: ghc-css-text-devel
BuildRequires: ghc-css-text-prof
BuildRequires: ghc-data-default-devel
++++++ yesod-static-1.6.1.0.tar.gz -> yesod-static-1.6.1.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.1.0/ChangeLog.md
new/yesod-static-1.6.1.2/ChangeLog.md
--- old/yesod-static-1.6.1.0/ChangeLog.md 2020-07-02 18:12:50.000000000
+0200
+++ new/yesod-static-1.6.1.2/ChangeLog.md 2026-01-20 22:19:40.000000000
+0100
@@ -1,5 +1,15 @@
# ChangeLog for yesod-static
+## 1.6.1.2
+
+* Allow JavaScript MIME type used by `mime-types >= 0.1.2.1` in test suite
[#1898](https://github.com/yesodweb/yesod/pull/1898)
+
+## 1.6.1.1
+
+* Use crypton instead of cryptonite
[#1838](https://github.com/yesodweb/yesod/pull/1838)
+* Set `base >= 4.11` for less CPP and imports
[#1876](https://github.com/yesodweb/yesod/pull/1876)
+
+
## 1.6.1.0
* Support reproducible embedded file order
[#1684](https://github.com/yesodweb/yesod/issues/1684#issuecomment-652562514)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yesod-static-1.6.1.0/Yesod/EmbeddedStatic/Css/AbsoluteUrl.hs
new/yesod-static-1.6.1.2/Yesod/EmbeddedStatic/Css/AbsoluteUrl.hs
--- old/yesod-static-1.6.1.0/Yesod/EmbeddedStatic/Css/AbsoluteUrl.hs
2020-06-24 09:26:46.000000000 +0200
+++ new/yesod-static-1.6.1.2/Yesod/EmbeddedStatic/Css/AbsoluteUrl.hs
2025-07-08 15:43:17.000000000 +0200
@@ -1,4 +1,5 @@
{-# LANGUAGE OverloadedStrings #-}
+
-- | Manipulate CSS urls.
--
-- * Make relative urls absolute (useful when combining assets)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yesod-static-1.6.1.0/Yesod/EmbeddedStatic/Css/Util.hs
new/yesod-static-1.6.1.2/Yesod/EmbeddedStatic/Css/Util.hs
--- old/yesod-static-1.6.1.0/Yesod/EmbeddedStatic/Css/Util.hs 2020-06-24
09:26:46.000000000 +0200
+++ new/yesod-static-1.6.1.2/Yesod/EmbeddedStatic/Css/Util.hs 2025-07-08
15:43:17.000000000 +0200
@@ -1,10 +1,14 @@
-{-# LANGUAGE OverloadedStrings, QuasiQuotes, TemplateHaskell, TupleSections,
GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TupleSections #-}
+
module Yesod.EmbeddedStatic.Css.Util where
-import Control.Applicative
+import Control.Applicative ((<|>))
import Control.Monad (void, foldM)
import Data.Hashable (Hashable)
-import Data.Monoid
import Network.Mime (MimeType, defaultMimeLookup)
import Text.CSS.Parse (parseBlocks)
import Language.Haskell.TH (litE, stringL)
@@ -68,8 +72,7 @@
parseCssWith :: (T.Text -> T.Text -> EithUrl) -> T.Text -> Either String Css
parseCssWith urlParser contents =
- let mparsed = parseBlocks contents in
- case mparsed of
+ case parseBlocks contents of
Left err -> Left err
Right blocks -> Right [ (t, map (uncurry urlParser) b) | (t,b) <-
blocks ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yesod-static-1.6.1.0/Yesod/EmbeddedStatic/Generators.hs
new/yesod-static-1.6.1.2/Yesod/EmbeddedStatic/Generators.hs
--- old/yesod-static-1.6.1.0/Yesod/EmbeddedStatic/Generators.hs 2020-07-02
18:11:48.000000000 +0200
+++ new/yesod-static-1.6.1.2/Yesod/EmbeddedStatic/Generators.hs 2025-07-08
15:43:18.000000000 +0200
@@ -1,4 +1,7 @@
-{-# LANGUAGE TemplateHaskell, QuasiQuotes, ScopedTypeVariables #-}
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TemplateHaskell #-}
+
-- | A generator is executed at compile time to load a list of entries
-- to embed into the subsite. This module contains several basic generators,
-- but the design of generators and entries is such that it is straightforward
@@ -30,10 +33,9 @@
-- $example
) where
-import Control.Applicative as A ((<$>), (<*>))
import Control.Exception (try, SomeException)
import Control.Monad (forM, when)
-import Data.Char (isDigit, isLower)
+import Data.Char (isLower)
import Data.Default (def)
import Data.Maybe (isNothing)
import Language.Haskell.TH
@@ -93,7 +95,7 @@
return (concat paths)
-- | Embed all files in a directory into the static subsite.
---
+--
-- Equivalent to passing the empty string as the location to 'embedDirAt',
-- so the directory path itself is not part of the resource locations (and so
-- also not part of the generated route variable names).
@@ -112,7 +114,7 @@
-- * js/jquery.js
--
-- * js/bootstrap.js
---
+--
-- then @embedDirAt \"somefolder\" \"static\"@ will
--
-- * Make the file @static\/css\/bootstrap.css@ available at the location
@@ -207,9 +209,9 @@
}
(Just hin, Just hout, _, ph) <- Proc.createProcess p
(compressed, (), code) <- runConcurrently $ (,,)
- A.<$> Concurrently (runConduit $ sourceHandle hout .| sinkLazy)
- A.<*> Concurrently (BL.hPut hin ct >> hClose hin)
- A.<*> Concurrently (Proc.waitForProcess ph)
+ <$> Concurrently (runConduit $ sourceHandle hout .| sinkLazy)
+ <*> Concurrently (BL.hPut hin ct >> hClose hin)
+ <*> Concurrently (Proc.waitForProcess ph)
if code == ExitSuccess
then do
putStrLn $ "Compressed successfully with " ++ f
@@ -246,11 +248,10 @@
| otherwise = '_'
name = map replace f
routeName = mkName $
- case () of
- ()
- | null name -> error "null-named file"
- | isDigit (head name) -> '_' : name
- | isLower (head name) -> name
+ case name of
+ [] -> error "null-named file"
+ n : _
+ | isLower n -> name
| otherwise -> '_' : name
@@ -295,7 +296,7 @@
--
-- Here is a small example yesod program using this generator. Try toggling
-- the development argument to @mkEmbeddedStatic@.
---
+--
-- >{-# LANGUAGE TemplateHaskell, QuasiQuotes, TypeFamilies #-}
-- >module Main where
-- >
@@ -321,7 +322,7 @@
-- >getHomeR :: Handler Html
-- >getHomeR = defaultLayout $ [whamlet|
-- ><h1>Hello
--- ><p>Check the
+-- ><p>Check the
-- > <a href=@{StaticR compile_time_json}>compile time
-- >|]
-- >
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yesod-static-1.6.1.0/Yesod/EmbeddedStatic/Internal.hs
new/yesod-static-1.6.1.2/Yesod/EmbeddedStatic/Internal.hs
--- old/yesod-static-1.6.1.0/Yesod/EmbeddedStatic/Internal.hs 2020-06-24
09:26:46.000000000 +0200
+++ new/yesod-static-1.6.1.2/Yesod/EmbeddedStatic/Internal.hs 2025-07-08
15:43:18.000000000 +0200
@@ -3,7 +3,7 @@
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TupleSections #-}
{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE CPP #-}
+
module Yesod.EmbeddedStatic.Internal (
EmbeddedStatic(..)
, Route(..)
@@ -16,7 +16,6 @@
, widgetSettings
) where
-import Control.Applicative as A ((<$>))
import Data.IORef
import Language.Haskell.TH
import Network.HTTP.Types (Status(..), status404, status200, status304)
@@ -40,16 +39,6 @@
import Yesod.Static (base64md5)
import Yesod.EmbeddedStatic.Types
-#if !MIN_VERSION_base(4,6,0)
--- copied from base
-atomicModifyIORef' :: IORef a -> (a -> (a,b)) -> IO b
-atomicModifyIORef' ref f = do
- b <- atomicModifyIORef ref
- (\x -> let (a, b) = f x
- in (a, a `seq` b))
- b `seq` return b
-#endif
-
-- | The subsite for the embedded static file server.
data EmbeddedStatic = EmbeddedStatic {
stApp :: !Application
@@ -144,7 +133,7 @@
-> (BL.ByteString -> Either a BL.ByteString)
-> AddStaticContent site
staticContentHelper getStatic staticR minify ext _ ct = do
- wIORef <- widgetFiles . getStatic A.<$> getYesod
+ wIORef <- widgetFiles . getStatic <$> getYesod
let hash = T.pack $ base64md5 ct
hash' = Just $ T.encodeUtf8 hash
filename = T.concat [hash, ".", ext]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.1.0/Yesod/EmbeddedStatic/Types.hs
new/yesod-static-1.6.1.2/Yesod/EmbeddedStatic/Types.hs
--- old/yesod-static-1.6.1.0/Yesod/EmbeddedStatic/Types.hs 2020-06-24
09:26:46.000000000 +0200
+++ new/yesod-static-1.6.1.2/Yesod/EmbeddedStatic/Types.hs 2025-07-08
15:43:18.000000000 +0200
@@ -1,4 +1,7 @@
-{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE TemplateHaskell #-}
+
module Yesod.EmbeddedStatic.Types(
Location
, Generator
@@ -32,7 +35,7 @@
-- given name will be created which points to this resource.
, ebLocation :: Location -- ^ The location to serve the resource from.
, ebMimeType :: MimeType -- ^ The mime type of the resource.
- , ebProductionContent :: IO BL.ByteString
+ , ebProductionContent :: IO BL.ByteString
-- ^ If the development argument to
'Yesod.EmbeddedStatic.mkEmbeddedStatic' is False,
-- then at compile time this action will be executed to load the
content.
-- During development, this action will not be executed.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.1.0/Yesod/EmbeddedStatic.hs
new/yesod-static-1.6.1.2/Yesod/EmbeddedStatic.hs
--- old/yesod-static-1.6.1.0/Yesod/EmbeddedStatic.hs 2020-06-24
09:26:46.000000000 +0200
+++ new/yesod-static-1.6.1.2/Yesod/EmbeddedStatic.hs 2025-07-08
15:43:17.000000000 +0200
@@ -1,13 +1,13 @@
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TemplateHaskell #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
+
-- | A subsite which serves static content which is embedded at compile time.
--
-- At compile time, you supply a list of files, directories, processing
functions (like javascript
@@ -49,7 +49,6 @@
, module Yesod.EmbeddedStatic.Generators
) where
-import Control.Applicative as A ((<$>))
import Data.IORef
import Data.Maybe (catMaybes)
import Language.Haskell.TH
@@ -98,7 +97,7 @@
, ValD (VarP name) (NormalB link) []
]
--- | Creates an 'EmbeddedStatic' by running, at compile time, a list of
generators.
+-- | Creates an 'EmbeddedStatic' by running, at compile time, a list of
generators.
-- Each generator produces a list of entries to embed into the executable.
--
-- This template haskell splice creates a variable binding holding the
resulting
@@ -132,7 +131,7 @@
-> [Generator] -- ^ the generators (see
"Yesod.EmbeddedStatic.Generators")
-> Q [Dec]
mkEmbeddedStatic dev esName gen = do
- entries <- concat A.<$> sequence gen
+ entries <- concat <$> sequence gen
computed <- runIO $ mapM (if dev then devEmbed else prodEmbed) entries
let settings = Static.mkSettings $ return $ map cStEntry computed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.1.0/Yesod/Static.hs
new/yesod-static-1.6.1.2/Yesod/Static.hs
--- old/yesod-static-1.6.1.0/Yesod/Static.hs 2020-07-04 18:09:32.000000000
+0200
+++ new/yesod-static-1.6.1.2/Yesod/Static.hs 2025-07-08 15:43:18.000000000
+0200
@@ -1,12 +1,12 @@
-{-# LANGUAGE QuasiQuotes #-}
-{-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE CPP #-}
+{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TypeFamilies #-}
---------------------------------------------------------
--
-- | Serve static files from a Yesod app.
@@ -87,7 +87,7 @@
import qualified Data.Text as T
import qualified Data.Map as M
import Data.IORef (readIORef, newIORef, writeIORef)
-import Data.Char (isLower, isDigit)
+import Data.Char (isLower)
import Data.List (foldl')
import qualified Data.ByteString as S
import System.PosixCompat.Files (getFileStatus, modificationTime)
@@ -392,11 +392,10 @@
mkRoute (alias, f) = do
let name' = intercalate "_" $ map (map replace') alias
routeName = mkName $
- case () of
- ()
- | null name' -> error "null-named file"
- | isDigit (head name') -> '_' : name'
- | isLower (head name') -> name'
+ case name' of
+ [] -> error "null-named file"
+ n : _
+ | isLower n -> name'
| otherwise -> '_' : name'
f' <- [|map pack $(TH.lift f)|]
qs <- if makeHash
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.1.0/sample-embed.hs
new/yesod-static-1.6.1.2/sample-embed.hs
--- old/yesod-static-1.6.1.0/sample-embed.hs 2020-06-24 09:26:46.000000000
+0200
+++ new/yesod-static-1.6.1.2/sample-embed.hs 2025-07-08 15:43:18.000000000
+0200
@@ -1,5 +1,8 @@
-{-# LANGUAGE TemplateHaskell, QuasiQuotes, TypeFamilies #-}
--- | This embeds just a single file; it embeds the source code file
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TypeFamilies #-}
+
+-- | This embeds just a single file; it embeds the source code file
-- \"sample-embed.hs\" from the current directory so when you compile,
-- the sample-embed.hs file must be in the current directory.
--
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.1.0/sample.hs
new/yesod-static-1.6.1.2/sample.hs
--- old/yesod-static-1.6.1.0/sample.hs 2020-06-24 09:26:46.000000000 +0200
+++ new/yesod-static-1.6.1.2/sample.hs 2025-07-08 15:43:18.000000000 +0200
@@ -1,5 +1,8 @@
-{-# LANGUAGE QuasiQuotes, TypeFamilies, MultiParamTypeClasses #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TypeFamilies #-}
+
import Yesod.Static
import Yesod.Core
import Network.Wai.Handler.Warp (run)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.1.0/test/EmbedDevelTest.hs
new/yesod-static-1.6.1.2/test/EmbedDevelTest.hs
--- old/yesod-static-1.6.1.0/test/EmbedDevelTest.hs 2020-06-24
09:26:46.000000000 +0200
+++ new/yesod-static-1.6.1.2/test/EmbedDevelTest.hs 2025-07-08
15:43:18.000000000 +0200
@@ -1,4 +1,8 @@
-{-# LANGUAGE TemplateHaskell, QuasiQuotes, TypeFamilies, OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TypeFamilies #-}
+
module EmbedDevelTest where
-- Tests the development mode of the embedded static subsite by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.1.0/test/EmbedProductionTest.hs
new/yesod-static-1.6.1.2/test/EmbedProductionTest.hs
--- old/yesod-static-1.6.1.0/test/EmbedProductionTest.hs 2020-06-24
09:26:46.000000000 +0200
+++ new/yesod-static-1.6.1.2/test/EmbedProductionTest.hs 2026-01-20
22:19:40.000000000 +0100
@@ -1,5 +1,9 @@
-{-# LANGUAGE TemplateHaskell, QuasiQuotes, TypeFamilies, OverloadedStrings #-}
{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TypeFamilies #-}
+
module EmbedProductionTest where
-- Tests the production mode of the embedded static subsite by
@@ -117,5 +121,10 @@
get $ TL.toStrict $ TL.decodeUtf8 src
statusIs 200
hasCacheControl
- assertHeader "Content-Type" "application/javascript"
+ withResponse $ \resp -> liftIO $
+ assertBool "Content-Type header is application/javascript or
text/javascript" $
+ lookup "Content-Type" (simpleHeaders resp) `elem`
+ [ Just "text/javascript" -- mime-types >= 0.1.2.1
+ , Just "application/javascript" -- mime-types <= 0.1.2.0
+ ]
bodyEquals "console.log(\"Hello World\");"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.1.0/test/EmbedTestGenerator.hs
new/yesod-static-1.6.1.2/test/EmbedTestGenerator.hs
--- old/yesod-static-1.6.1.0/test/EmbedTestGenerator.hs 2020-06-24
09:26:46.000000000 +0200
+++ new/yesod-static-1.6.1.2/test/EmbedTestGenerator.hs 2025-07-08
15:43:18.000000000 +0200
@@ -1,4 +1,7 @@
-{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE TemplateHaskell #-}
+
module EmbedTestGenerator (testGen) where
import Data.Default
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.1.0/test/FileGeneratorTests.hs
new/yesod-static-1.6.1.2/test/FileGeneratorTests.hs
--- old/yesod-static-1.6.1.0/test/FileGeneratorTests.hs 2020-06-24
09:26:46.000000000 +0200
+++ new/yesod-static-1.6.1.2/test/FileGeneratorTests.hs 2025-07-08
15:43:18.000000000 +0200
@@ -1,4 +1,7 @@
-{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE TemplateHaskell #-}
+
module FileGeneratorTests (fileGenSpecs) where
import Control.Exception
@@ -11,7 +14,7 @@
-- | Embeds the LICENSE file
license :: GenTestResult
-license = $(embedFile "LICENSE" >>=
+license = $(embedFile "LICENSE" >>=
testOneEntry (Just "_LICENSE") "LICENSE" (BL.readFile "LICENSE")
)
@@ -22,7 +25,7 @@
embDir :: [GenTestResult]
embDir = $(embedDir "test/embed-dir" >>=
- testEntries
+ testEntries
[ (Just "abc_def_txt", "abc/def.txt", BL.readFile
"test/embed-dir/abc/def.txt")
, (Just "lorem_txt", "lorem.txt", BL.readFile
"test/embed-dir/lorem.txt")
, (Just "foo", "foo", BL.readFile "test/embed-dir/foo")
@@ -31,7 +34,7 @@
embDirAt :: [GenTestResult]
embDirAt = $(embedDirAt "xxx" "test/embed-dir" >>=
- testEntries
+ testEntries
[ (Just "xxx_abc_def_txt", "xxx/abc/def.txt", BL.readFile
"test/embed-dir/abc/def.txt")
, (Just "xxx_lorem_txt", "xxx/lorem.txt", BL.readFile
"test/embed-dir/lorem.txt")
, (Just "xxx_foo", "xxx/foo", BL.readFile "test/embed-dir/foo")
@@ -50,7 +53,7 @@
[ "test/embed-dir/abc/def.txt",
"test/embed-dir/foo"] >>=
testOneEntry (Just "out2_txt") "out2.txt" (return "Yesod
Rocks\nBar\nExtra")
)
-
+
fileGenSpecs :: Spec
fileGenSpecs = do
describe "Embed File" $ do
@@ -82,7 +85,7 @@
BL.filter (/= 13) out `shouldBe` "Hello World\n"
it "tryCompressTools" $ do
- out <- flip tryCompressTools "abcdef"
+ out <- flip tryCompressTools "abcdef"
[ const $ throwIO $ ErrorCall "An expected error"
, const $ return "foo"
, const $ return "bar"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.1.0/test/GeneratorTestUtil.hs
new/yesod-static-1.6.1.2/test/GeneratorTestUtil.hs
--- old/yesod-static-1.6.1.0/test/GeneratorTestUtil.hs 2020-06-24
09:26:46.000000000 +0200
+++ new/yesod-static-1.6.1.2/test/GeneratorTestUtil.hs 2025-07-08
15:43:18.000000000 +0200
@@ -1,7 +1,9 @@
-{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE TemplateHaskell #-}
+
module GeneratorTestUtil where
-import Control.Applicative
import Control.Monad (when)
import Data.List (sortBy)
import Language.Haskell.TH
@@ -22,7 +24,7 @@
-- | Creates a GenTestResult at compile time by testing the entry.
testEntry :: Maybe String -> Y.Location -> IO BL.ByteString -> Entry -> ExpQ
-testEntry name _ _ e | ebHaskellName e /= (mkName Control.Applicative.<$>
name) =
+testEntry name _ _ e | ebHaskellName e /= (mkName <$> name) =
[| GenError ("haskell name " ++ $(litE $ stringL $ show $ ebHaskellName e)
++ " /= "
++ $(litE $ stringL $ show name)) |]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.1.0/yesod-static.cabal
new/yesod-static-1.6.1.2/yesod-static.cabal
--- old/yesod-static-1.6.1.0/yesod-static.cabal 2020-07-02 18:18:17.000000000
+0200
+++ new/yesod-static-1.6.1.2/yesod-static.cabal 2026-01-20 22:19:40.000000000
+0100
@@ -1,5 +1,5 @@
name: yesod-static
-version: 1.6.1.0
+version: 1.6.1.2
license: MIT
license-file: LICENSE
author: Michael Snoyman <[email protected]>
@@ -27,7 +27,7 @@
library
default-language: Haskell2010
- build-depends: base >= 4.10 && < 5
+ build-depends: base >= 4.11 && < 5
, async
, attoparsec >= 0.10
, base64-bytestring >= 0.1.0.1
@@ -35,8 +35,8 @@
, bytestring >= 0.9.1.4
, conduit >= 1.3
, containers >= 0.2
- , cryptonite >= 0.11
- , cryptonite-conduit >= 0.1
+ , crypton >= 1.0
+ , crypton-conduit >= 0.2.3
, css-text >= 0.1.2
, data-default
, directory >= 1.0
@@ -86,7 +86,7 @@
Yesod.EmbeddedStatic.Types
Yesod.Static
YesodStaticTest
- build-depends: base
+ build-depends: base < 5
, hspec >= 1.3
, yesod-test >= 1.6
, wai-extra
@@ -98,8 +98,8 @@
, bytestring
, conduit
, containers
- , cryptonite
- , cryptonite-conduit
+ , crypton
+ , crypton-conduit
, data-default
, directory
, file-embed
