Hello community,
here is the log from the commit of package ghc-yesod-static for
openSUSE:Factory checked in at 2020-07-09 13:19:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-yesod-static (Old)
and /work/SRC/openSUSE:Factory/.ghc-yesod-static.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-yesod-static"
Thu Jul 9 13:19:50 2020 rev:2 rq:819596 version:1.6.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-yesod-static/ghc-yesod-static.changes
2020-06-19 17:06:31.760964652 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-yesod-static.new.3060/ghc-yesod-static.changes
2020-07-09 13:20:19.337450658 +0200
@@ -1,0 +2,14 @@
+Tue Jul 7 02:00:25 UTC 2020 - [email protected]
+
+- Update yesod-static to version 1.6.1.0.
+ # ChangeLog for yesod-static
+
+ ## 1.6.1.0
+
+ * Support reproducible embedded file order
[#1684](https://github.com/yesodweb/yesod/issues/1684#issuecomment-652562514)
+
+ ## 1.6.0.2
+
+ * Remove unnecessary deriving of Typeable
+
+-------------------------------------------------------------------
Old:
----
yesod-static-1.6.0.1.tar.gz
New:
----
yesod-static-1.6.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-yesod-static.spec ++++++
--- /var/tmp/diff_new_pack.gWBdcU/_old 2020-07-09 13:20:22.285459976 +0200
+++ /var/tmp/diff_new_pack.gWBdcU/_new 2020-07-09 13:20:22.285459976 +0200
@@ -19,7 +19,7 @@
%global pkg_name yesod-static
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 1.6.0.1
+Version: 1.6.1.0
Release: 0
Summary: Static file serving subsite for Yesod Web Framework
License: MIT
@@ -58,6 +58,7 @@
%if %{with tests}
BuildRequires: ghc-HUnit-devel
BuildRequires: ghc-hspec-devel
+BuildRequires: ghc-rio-devel
BuildRequires: ghc-wai-extra-devel
BuildRequires: ghc-yesod-test-devel
%endif
++++++ yesod-static-1.6.0.1.tar.gz -> yesod-static-1.6.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.0.1/ChangeLog.md
new/yesod-static-1.6.1.0/ChangeLog.md
--- old/yesod-static-1.6.0.1/ChangeLog.md 2018-10-14 09:46:44.000000000
+0200
+++ new/yesod-static-1.6.1.0/ChangeLog.md 2020-07-02 18:12:50.000000000
+0200
@@ -1,3 +1,13 @@
+# ChangeLog for yesod-static
+
+## 1.6.1.0
+
+* Support reproducible embedded file order
[#1684](https://github.com/yesodweb/yesod/issues/1684#issuecomment-652562514)
+
+## 1.6.0.2
+
+* Remove unnecessary deriving of Typeable
+
## 1.6.0.1
* Make test suite build with GHC 8.6
[#1561](https://github.com/yesodweb/yesod/pull/1561)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yesod-static-1.6.0.1/Yesod/EmbeddedStatic/Generators.hs
new/yesod-static-1.6.1.0/Yesod/EmbeddedStatic/Generators.hs
--- old/yesod-static-1.6.0.1/Yesod/EmbeddedStatic/Generators.hs 2018-02-02
10:28:39.000000000 +0100
+++ new/yesod-static-1.6.1.0/Yesod/EmbeddedStatic/Generators.hs 2020-07-02
18:11:48.000000000 +0200
@@ -49,6 +49,7 @@
import System.Exit (ExitCode (ExitSuccess))
import Control.Concurrent.Async (Concurrently (..))
import System.IO (hClose)
+import Data.List (sort)
import Yesod.EmbeddedStatic.Types
@@ -80,7 +81,7 @@
-> FilePath -- ^ The prefix to add to the filenames
-> IO [(Location,FilePath)]
getRecursiveContents prefix topdir = do
- names <- getDirectoryContents topdir
+ names <- sort <$> getDirectoryContents topdir
let properNames = filter (`notElem` [".", ".."]) names
paths <- forM properNames $ \name -> do
let path = topdir </> name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.0.1/Yesod/Static.hs
new/yesod-static-1.6.1.0/Yesod/Static.hs
--- old/yesod-static-1.6.0.1/Yesod/Static.hs 2018-02-02 10:28:39.000000000
+0100
+++ new/yesod-static-1.6.1.0/Yesod/Static.hs 2020-07-04 18:09:32.000000000
+0200
@@ -71,7 +71,7 @@
import Yesod.Core
import Yesod.Core.Types
-import Data.List (intercalate)
+import Data.List (intercalate, sort)
import Language.Haskell.TH
import Language.Haskell.TH.Syntax as TH
@@ -192,7 +192,7 @@
-> ([String] -> [String])
-> StateT (M.Map String String) IO [[String]]
go fp front = do
- allContents <- liftIO $ filter notHidden `fmap` getDirectoryContents fp
+ allContents <- liftIO $ (sort . filter notHidden) `fmap`
getDirectoryContents fp
let fullPath :: String -> String
fullPath f = fp ++ '/' : f
files <- liftIO $ filterM (doesFileExist . fullPath) allContents
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.0.1/test/GeneratorTestUtil.hs
new/yesod-static-1.6.1.0/test/GeneratorTestUtil.hs
--- old/yesod-static-1.6.0.1/test/GeneratorTestUtil.hs 2017-02-05
13:38:01.000000000 +0100
+++ new/yesod-static-1.6.1.0/test/GeneratorTestUtil.hs 2020-06-24
09:26:46.000000000 +0200
@@ -8,6 +8,7 @@
import Test.HUnit
import Yesod.EmbeddedStatic.Types as Y
import qualified Data.ByteString.Lazy as BL
+import RIO (HasCallStack)
-- We test the generators by executing them at compile time
-- and sticking the result into the GenTestResult. We then
@@ -28,11 +29,15 @@
testEntry _ loc _ e | ebLocation e /= loc =
[| GenError ("location " ++ $(litE $ stringL $ show $ ebLocation e)) |]
testEntry _ _ act e = do
- expected <- runIO act
- actual <- runIO $ ebProductionContent e
+ expected <- fmap stripCR $ runIO act
+ actual <- fmap stripCR $ runIO $ ebProductionContent e
if expected == actual
then [| GenSuccessWithDevel $(ebDevelReload e) |]
- else [| GenError "production content" |]
+ else [| GenError $ "production content: " ++ $(litE $ stringL $ show
(expected, actual)) |]
+
+-- | Remove all carriage returns, for Windows testing
+stripCR :: BL.ByteString -> BL.ByteString
+stripCR = BL.filter (/= 13)
testOneEntry :: Maybe String -> Y.Location -> IO BL.ByteString -> [Entry] ->
ExpQ
testOneEntry name loc ct [e] = testEntry name loc ct e
@@ -48,12 +53,13 @@
f (name, loc, ct) e = testEntry name loc ct e
-- | Use this at runtime to assert the 'GenTestResult' is OK
-assertGenResult :: (IO BL.ByteString) -- ^ expected development content
+assertGenResult :: HasCallStack
+ => (IO BL.ByteString) -- ^ expected development content
-> GenTestResult -- ^ test result created at compile time
-> Assertion
assertGenResult _ (GenError e) = assertFailure ("invalid " ++ e)
assertGenResult mexpected (GenSuccessWithDevel mactual) = do
- expected <- mexpected
- actual <- mactual
+ expected <- fmap stripCR mexpected
+ actual <- fmap stripCR mactual
when (expected /= actual) $
- assertFailure "invalid devel content"
+ assertFailure $ "invalid devel content: " ++ show (expected, actual)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yesod-static-1.6.0.1/yesod-static.cabal
new/yesod-static-1.6.1.0/yesod-static.cabal
--- old/yesod-static-1.6.0.1/yesod-static.cabal 2018-10-14 09:46:44.000000000
+0200
+++ new/yesod-static-1.6.1.0/yesod-static.cabal 2020-07-02 18:18:17.000000000
+0200
@@ -1,5 +1,5 @@
name: yesod-static
-version: 1.6.0.1
+version: 1.6.1.0
license: MIT
license-file: LICENSE
author: Michael Snoyman <[email protected]>
@@ -7,7 +7,7 @@
synopsis: Static file serving subsite for Yesod Web Framework.
category: Web, Yesod
stability: Stable
-cabal-version: >= 1.8
+cabal-version: >= 1.10
build-type: Simple
homepage: http://www.yesodweb.com/
description: API docs and the README are available at
<http://www.stackage.org/package/yesod-static>
@@ -26,7 +26,8 @@
README.md
library
- build-depends: base >= 4 && < 5
+ default-language: Haskell2010
+ build-depends: base >= 4.10 && < 5
, async
, attoparsec >= 0.10
, base64-bytestring >= 0.1.0.1
@@ -66,9 +67,10 @@
Yesod.EmbeddedStatic.Css.Util
ghc-options: -Wall
- extensions: TemplateHaskell
+ other-extensions: TemplateHaskell
test-suite tests
+ default-language: Haskell2010
hs-source-dirs: ., test
main-is: tests.hs
type: exitcode-stdio-1.0
@@ -115,9 +117,10 @@
, wai
, wai-app-static
, yesod-core
+ , rio
ghc-options: -Wall -threaded
- extensions: TemplateHaskell
+ other-extensions: TemplateHaskell
source-repository head
type: git
