Hello community,

here is the log from the commit of package ghc-file-embed for openSUSE:Factory 
checked in at 2020-07-09 13:19:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old)
 and      /work/SRC/openSUSE:Factory/.ghc-file-embed.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ghc-file-embed"

Thu Jul  9 13:19:11 2020 rev:13 rq:819574 version:0.0.13.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes    
2020-06-19 17:12:52.922050178 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new.3060/ghc-file-embed.changes  
2020-07-09 13:19:36.213314361 +0200
@@ -1,0 +2,8 @@
+Tue Jul  7 02:00:28 UTC 2020 - psim...@suse.com
+
+- Update file-embed to version 0.0.13.0.
+  ## 0.0.13.0
+
+  * Ensure that directory listings are returned in sorted order for 
reproducibility 
[yesodweb/yesod#1684](https://github.com/yesodweb/yesod/issues/1684)
+
+-------------------------------------------------------------------

Old:
----
  file-embed-0.0.12.0.tar.gz

New:
----
  file-embed-0.0.13.0.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ghc-file-embed.spec ++++++
--- /var/tmp/diff_new_pack.2ovnrl/_old  2020-07-09 13:19:36.673315815 +0200
+++ /var/tmp/diff_new_pack.2ovnrl/_new  2020-07-09 13:19:36.673315815 +0200
@@ -19,7 +19,7 @@
 %global pkg_name file-embed
 %bcond_with tests
 Name:           ghc-%{pkg_name}
-Version:        0.0.12.0
+Version:        0.0.13.0
 Release:        0
 Summary:        Use Template Haskell to embed file contents directly
 License:        BSD-2-Clause

++++++ file-embed-0.0.12.0.tar.gz -> file-embed-0.0.13.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/file-embed-0.0.12.0/ChangeLog.md 
new/file-embed-0.0.13.0/ChangeLog.md
--- old/file-embed-0.0.12.0/ChangeLog.md        2020-05-12 10:03:18.000000000 
+0200
+++ new/file-embed-0.0.13.0/ChangeLog.md        2020-07-01 09:40:24.000000000 
+0200
@@ -1,5 +1,9 @@
 # ChangeLog for file-embed
 
+## 0.0.13.0
+
+* Ensure that directory listings are returned in sorted order for 
reproducibility 
[yesodweb/yesod#1684](https://github.com/yesodweb/yesod/issues/1684)
+
 ## 0.0.12.0
 
 * Use the `Bytes` literal on newer GHCs to reduce memory usage during 
compilation [#36](https://github.com/snoyberg/file-embed/pull/36)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/file-embed-0.0.12.0/Data/FileEmbed.hs 
new/file-embed-0.0.13.0/Data/FileEmbed.hs
--- old/file-embed-0.0.12.0/Data/FileEmbed.hs   2020-05-12 10:02:47.000000000 
+0200
+++ new/file-embed-0.0.13.0/Data/FileEmbed.hs   2020-07-01 09:39:04.000000000 
+0200
@@ -71,6 +71,8 @@
 import System.FilePath ((</>), takeDirectory, takeExtension)
 import Data.String (fromString)
 import Prelude as P
+import Data.List (sortBy)
+import Data.Ord (comparing)
 
 -- | Embed a single file in your source code.
 --
@@ -234,7 +236,7 @@
              mapM (liftPair2 . second B.readFile)
     dirs <- filterM (doesDirectoryExist . snd) all' >>=
             mapM (fileList' realTop . fst)
-    return $ concat $ files : dirs
+    return $ sortBy (comparing fst) $ concat $ files : dirs
 
 liftPair2 :: Monad m => (a, m b) -> m (a, b)
 liftPair2 (a, b) = b >>= \b' -> return (a, b')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/file-embed-0.0.12.0/file-embed.cabal 
new/file-embed-0.0.13.0/file-embed.cabal
--- old/file-embed-0.0.12.0/file-embed.cabal    2020-05-12 11:56:06.000000000 
+0200
+++ new/file-embed-0.0.13.0/file-embed.cabal    2020-07-01 09:40:44.000000000 
+0200
@@ -1,5 +1,5 @@
 name:            file-embed
-version:         0.0.12.0
+version:         0.0.13.0
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <mich...@snoyman.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/file-embed-0.0.12.0/test/main.hs 
new/file-embed-0.0.13.0/test/main.hs
--- old/file-embed-0.0.12.0/test/main.hs        2020-02-27 11:27:05.000000000 
+0100
+++ new/file-embed-0.0.13.0/test/main.hs        2020-07-01 09:39:37.000000000 
+0200
@@ -14,8 +14,8 @@
 main = do
     let received = $(embedDir "test/sample")
     received @?=
-        [ ("foo", "foo\r\n")
-        , ("bar" </> "baz", "baz\r\n")
+        [ ("bar" </> "baz", "baz\r\n")
+        , ("foo", "foo\r\n")
         ]
     let str = $(embedStringFile "test/sample/foo") :: String
     filter (/= '\r') str @?= "foo\n"


Reply via email to