commit ghc-file-embed for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-file-embed for openSUSE:Factory checked in at 2020-08-28 21:32:34 Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old) and /work/SRC/openSUSE:Factory/.ghc-file-embed.new.3399 (New) Package is "ghc-file-embed" Fri Aug 28 21:32:34 2020 rev:14 rq:829276 version:0.0.13.0 Changes: --- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes 2020-07-09 13:19:36.213314361 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new.3399/ghc-file-embed.changes 2020-08-28 21:32:34.860644295 +0200 @@ -1,0 +2,5 @@ +Tue Aug 18 10:44:51 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +--- Other differences: -- ++ ghc-file-embed.spec ++ --- /var/tmp/diff_new_pack.NDZNgD/_old 2020-08-28 21:32:35.356644530 +0200 +++ /var/tmp/diff_new_pack.NDZNgD/_new 2020-08-28 21:32:35.360644532 +0200 @@ -47,7 +47,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build
commit ghc-file-embed for openSUSE:Factory
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.md2020-05-12 10:03:18.0 +0200 +++ new/file-embed-0.0.13.0/ChangeLog.md2020-07-01 09:40:24.0 +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.0 +0200 +++ new/file-embed-0.0.13.0/Data/FileEmbed.hs 2020-07-01 09:39:04.0 +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.cabal2020-05-12 11:56:06.0 +0200 +++ new/file-embed-0.0.13.0/file-embed.cabal2020-07-01 09:40:44.0 +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 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.hs2020-02-27 11:27:05.0 +0100 +++ new/file-embed-0.0.13.0/test/main.hs2020-07-01 09:39:37.0 +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"
commit ghc-file-embed for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-file-embed for openSUSE:Factory checked in at 2020-06-19 17:12:49 Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old) and /work/SRC/openSUSE:Factory/.ghc-file-embed.new.3606 (New) Package is "ghc-file-embed" Fri Jun 19 17:12:49 2020 rev:12 rq:815092 version:0.0.12.0 Changes: --- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes 2020-03-09 14:16:14.370619545 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new.3606/ghc-file-embed.changes 2020-06-19 17:12:52.922050178 +0200 @@ -2 +2 @@ -Thu Feb 27 14:17:45 UTC 2020 - psim...@suse.com +Tue Jun 9 09:26:17 UTC 2020 - psim...@suse.com @@ -4,2 +4 @@ -- Update file-embed to version 0.0.11.2. - ## 0.0.11.2 +- Add file-embed at version 0.0.12.0. @@ -7,73 +5,0 @@ - * Haddock markup fix - -Fri Dec 20 03:02:06 UTC 2019 - psim...@suse.com - -- Update file-embed to version 0.0.11.1. - # ChangeLog for file-embed - - ## 0.0.11.1 - - * Support GHC 8.10 - -Fri Nov 8 16:13:44 UTC 2019 - Peter Simons - -- Drop obsolete group attributes. - -Sat Oct 20 11:31:30 UTC 2018 - Peter Simons - -- Use https URL to refer to bugs.opensuse.org. - -Tue Jul 31 14:10:04 UTC 2018 - psim...@suse.com - -- Update file-embed to version 0.0.11. - ## 0.0.11 - - * embedDirListing [#26](https://github.com/snoyberg/file-embed/pull/26) - -Wed Jul 18 14:26:24 UTC 2018 - psim...@suse.com - -- Cosmetic: replace tabs with blanks, strip trailing white space, - and update copyright headers with spec-cleaner. - -Mon May 14 17:02:11 UTC 2018 - psim...@suse.com - -- Update file-embed to version 0.0.10.1. - * Minor doc improvements - -Thu Aug 3 15:38:38 UTC 2017 - psim...@suse.com - -- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. - -Sun Jul 10 17:15:55 UTC 2016 - psim...@suse.com - -- Update to version 0.0.10 revision 0 with cabal2obs. - -Tue Apr 26 08:25:43 UTC 2016 - mimi...@gmail.com - -- update to 0.0.10 -* makeRelativeToProject - -Fri Jan 22 08:46:18 UTC 2016 - mimi...@gmail.com - -- update to 0.0.9.1 -* embedStringFile - -Mon Nov 23 09:56:34 UTC 2015 - mimi...@gmail.com - -- correct licence to BSD-2-Clause - -Tue Nov 17 19:28:15 UTC 2015 - mimi...@gmail.com - -- initial commit Old: file-embed-0.0.11.2.tar.gz New: file-embed-0.0.12.0.tar.gz Other differences: -- ++ ghc-file-embed.spec ++ --- /var/tmp/diff_new_pack.JDjxF6/_old 2020-06-19 17:12:53.518052172 +0200 +++ /var/tmp/diff_new_pack.JDjxF6/_new 2020-06-19 17:12:53.518052172 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-file-embed # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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 file-embed %bcond_with tests Name: ghc-%{pkg_name} -Version:0.0.11.2 +Version:0.0.12.0 Release:0 Summary:Use Template Haskell to embed file contents directly License:BSD-2-Clause ++ file-embed-0.0.11.2.tar.gz -> file-embed-0.0.12.0.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.11.2/ChangeLog.md new/file-embed-0.0.12.0/ChangeLog.md --- old/file-embed-0.0.11.2/ChangeLog.md2020-02-27 10:20:24.0 +0100 +++ new/file-embed-0.0.12.0/ChangeLog.md2020-05-12 10:03:18.0 +0200 @@ -1,5 +1,9 @@ # ChangeLog for file-embed +## 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) + ## 0.0.11.2 * Haddock markup fix diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.11.2/Data/FileEmbed.hs
commit ghc-file-embed for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-file-embed for openSUSE:Factory checked in at 2020-03-09 14:16:10 Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old) and /work/SRC/openSUSE:Factory/.ghc-file-embed.new.26092 (New) Package is "ghc-file-embed" Mon Mar 9 14:16:10 2020 rev:11 rq:780019 version:0.0.11.2 Changes: --- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes 2019-12-27 13:53:35.884664960 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new.26092/ghc-file-embed.changes 2020-03-09 14:16:14.370619545 +0100 @@ -1,0 +2,8 @@ +Thu Feb 27 14:17:45 UTC 2020 - psim...@suse.com + +- Update file-embed to version 0.0.11.2. + ## 0.0.11.2 + + * Haddock markup fix + +--- Old: file-embed-0.0.11.1.tar.gz New: file-embed-0.0.11.2.tar.gz Other differences: -- ++ ghc-file-embed.spec ++ --- /var/tmp/diff_new_pack.lmacqx/_old 2020-03-09 14:16:15.786620478 +0100 +++ /var/tmp/diff_new_pack.lmacqx/_new 2020-03-09 14:16:15.786620478 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-file-embed # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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 @@ -19,7 +19,7 @@ %global pkg_name file-embed %bcond_with tests Name: ghc-%{pkg_name} -Version:0.0.11.1 +Version:0.0.11.2 Release:0 Summary:Use Template Haskell to embed file contents directly License:BSD-2-Clause ++ file-embed-0.0.11.1.tar.gz -> file-embed-0.0.11.2.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.11.1/ChangeLog.md new/file-embed-0.0.11.2/ChangeLog.md --- old/file-embed-0.0.11.1/ChangeLog.md2019-12-16 08:42:24.0 +0100 +++ new/file-embed-0.0.11.2/ChangeLog.md2020-02-27 10:20:24.0 +0100 @@ -1,5 +1,9 @@ # ChangeLog for file-embed +## 0.0.11.2 + +* Haddock markup fix + ## 0.0.11.1 * Support GHC 8.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.11.1/Data/FileEmbed.hs new/file-embed-0.0.11.2/Data/FileEmbed.hs --- old/file-embed-0.0.11.1/Data/FileEmbed.hs 2019-12-16 08:41:16.0 +0100 +++ new/file-embed-0.0.11.2/Data/FileEmbed.hs 2020-02-27 10:19:11.0 +0100 @@ -369,9 +369,7 @@ -- finds the first parent directory with a .cabal file, and uses that as the -- root directory for fixing the relative path. -- --- @@@ --- $(makeRelativeToProject "data/foo.txt" >>= embedFile) --- @@@ +-- @$(makeRelativeToProject "data/foo.txt" >>= embedFile)@ -- -- @since 0.0.10 makeRelativeToProject :: FilePath -> Q FilePath diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.11.1/file-embed.cabal new/file-embed-0.0.11.2/file-embed.cabal --- old/file-embed-0.0.11.1/file-embed.cabal2019-12-19 21:18:03.0 +0100 +++ new/file-embed-0.0.11.2/file-embed.cabal2020-02-27 10:20:11.0 +0100 @@ -1,5 +1,5 @@ name:file-embed -version: 0.0.11.1 +version: 0.0.11.2 license: BSD3 license-file:LICENSE author: Michael Snoyman
commit ghc-file-embed for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-file-embed for openSUSE:Factory checked in at 2019-12-27 13:53:33 Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old) and /work/SRC/openSUSE:Factory/.ghc-file-embed.new.6675 (New) Package is "ghc-file-embed" Fri Dec 27 13:53:33 2019 rev:10 rq:759398 version:0.0.11.1 Changes: --- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes 2018-10-25 08:25:31.415824712 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new.6675/ghc-file-embed.changes 2019-12-27 13:53:35.884664960 +0100 @@ -1,0 +2,15 @@ +Fri Dec 20 03:02:06 UTC 2019 - psim...@suse.com + +- Update file-embed to version 0.0.11.1. + # ChangeLog for file-embed + + ## 0.0.11.1 + + * Support GHC 8.10 + +--- +Fri Nov 8 16:13:44 UTC 2019 - Peter Simons + +- Drop obsolete group attributes. + +--- Old: file-embed-0.0.11.tar.gz New: file-embed-0.0.11.1.tar.gz Other differences: -- ++ ghc-file-embed.spec ++ --- /var/tmp/diff_new_pack.yk5RxI/_old 2019-12-27 13:53:36.868665435 +0100 +++ /var/tmp/diff_new_pack.yk5RxI/_new 2019-12-27 13:53:36.872665437 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-file-embed # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -19,11 +19,10 @@ %global pkg_name file-embed %bcond_with tests Name: ghc-%{pkg_name} -Version:0.0.11 +Version:0.0.11.1 Release:0 Summary:Use Template Haskell to embed file contents directly License:BSD-2-Clause -Group: Development/Libraries/Haskell URL:https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel @@ -39,7 +38,6 @@ %package devel Summary:Haskell %{pkg_name} library development files -Group: Development/Libraries/Haskell Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} ++ file-embed-0.0.11.tar.gz -> file-embed-0.0.11.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.11/ChangeLog.md new/file-embed-0.0.11.1/ChangeLog.md --- old/file-embed-0.0.11/ChangeLog.md 2018-07-29 09:19:51.0 +0200 +++ new/file-embed-0.0.11.1/ChangeLog.md2019-12-16 08:42:24.0 +0100 @@ -1,3 +1,9 @@ +# ChangeLog for file-embed + +## 0.0.11.1 + +* Support GHC 8.10 + ## 0.0.11 * embedDirListing [#26](https://github.com/snoyberg/file-embed/pull/26) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.11/Data/FileEmbed.hs new/file-embed-0.0.11.1/Data/FileEmbed.hs --- old/file-embed-0.0.11/Data/FileEmbed.hs 2018-07-29 09:19:51.0 +0200 +++ new/file-embed-0.0.11.1/Data/FileEmbed.hs 2019-12-16 08:41:16.0 +0100 @@ -143,7 +143,11 @@ qAddDependentFile $ _root ++ '/' : path #endif exp' <- bsToExp bs -return $! TupE [LitE $ StringL path, exp'] +return $! TupE +#if MIN_VERSION_template_haskell(2,16,0) + $ map Just +#endif + [LitE $ StringL path, exp'] bsToExp :: B.ByteString -> Q Exp #if MIN_VERSION_template_haskell(2, 5, 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.11/file-embed.cabal new/file-embed-0.0.11.1/file-embed.cabal --- old/file-embed-0.0.11/file-embed.cabal 2018-07-29 09:19:51.0 +0200 +++ new/file-embed-0.0.11.1/file-embed.cabal2019-12-19 21:18:03.0 +0100 @@ -1,5 +1,5 @@ name:file-embed -version: 0.0.11 +version: 0.0.11.1 license: BSD3 license-file:LICENSE author: Michael Snoyman @@ -18,7 +18,7 @@ README.md library -build-depends: base >= 4 && < 5 +build-depends: base >= 4.9.1 && < 5 , bytestring >= 0.9.1.4 , directory >= 1.0.0.3 , template-haskell
commit ghc-file-embed for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-file-embed for openSUSE:Factory checked in at 2018-10-25 08:25:27 Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old) and /work/SRC/openSUSE:Factory/.ghc-file-embed.new (New) Package is "ghc-file-embed" Thu Oct 25 08:25:27 2018 rev:9 rq:643393 version:0.0.11 Changes: --- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes 2018-08-04 21:53:58.973342531 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new/ghc-file-embed.changes 2018-10-25 08:25:31.415824712 +0200 @@ -1,0 +2,5 @@ +Sat Oct 20 11:31:30 UTC 2018 - Peter Simons + +- Use https URL to refer to bugs.opensuse.org. + +--- Other differences: -- ++ ghc-file-embed.spec ++ --- /var/tmp/diff_new_pack.0cSndj/_old 2018-10-25 08:25:32.211824348 +0200 +++ /var/tmp/diff_new_pack.0cSndj/_new 2018-10-25 08:25:32.215824346 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ #
commit ghc-file-embed for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-file-embed for openSUSE:Factory checked in at 2018-08-04 21:53:58 Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old) and /work/SRC/openSUSE:Factory/.ghc-file-embed.new (New) Package is "ghc-file-embed" Sat Aug 4 21:53:58 2018 rev:8 rq:627276 version:0.0.11 Changes: --- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes 2018-07-24 17:18:45.899021270 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new/ghc-file-embed.changes 2018-08-04 21:53:58.973342531 +0200 @@ -1,0 +2,8 @@ +Tue Jul 31 14:10:04 UTC 2018 - psim...@suse.com + +- Update file-embed to version 0.0.11. + ## 0.0.11 + + * embedDirListing [#26](https://github.com/snoyberg/file-embed/pull/26) + +--- Old: file-embed-0.0.10.1.tar.gz New: file-embed-0.0.11.tar.gz Other differences: -- ++ ghc-file-embed.spec ++ --- /var/tmp/diff_new_pack.jjWzMK/_old 2018-08-04 21:53:59.517343549 +0200 +++ /var/tmp/diff_new_pack.jjWzMK/_new 2018-08-04 21:53:59.517343549 +0200 @@ -19,7 +19,7 @@ %global pkg_name file-embed %bcond_with tests Name: ghc-%{pkg_name} -Version:0.0.10.1 +Version:0.0.11 Release:0 Summary:Use Template Haskell to embed file contents directly License:BSD-2-Clause ++ file-embed-0.0.10.1.tar.gz -> file-embed-0.0.11.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.10.1/ChangeLog.md new/file-embed-0.0.11/ChangeLog.md --- old/file-embed-0.0.10.1/ChangeLog.md2017-09-14 11:42:06.0 +0200 +++ new/file-embed-0.0.11/ChangeLog.md 2018-07-29 09:19:51.0 +0200 @@ -1,3 +1,7 @@ +## 0.0.11 + +* embedDirListing [#26](https://github.com/snoyberg/file-embed/pull/26) + ## 0.0.10.1 * Minor doc improvements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.10.1/Data/FileEmbed.hs new/file-embed-0.0.11/Data/FileEmbed.hs --- old/file-embed-0.0.10.1/Data/FileEmbed.hs 2017-09-14 09:58:52.0 +0200 +++ new/file-embed-0.0.11/Data/FileEmbed.hs 2018-07-29 09:19:51.0 +0200 @@ -21,6 +21,7 @@ embedFile , embedOneFileOf , embedDir +, embedDirListing , getDir -- * Embed as a IsString , embedStringFile @@ -90,7 +91,7 @@ -- > import qualified Data.ByteString -- > -- > myFile :: Data.ByteString.ByteString --- > myFile = $(embedFile' [ "dirName/fileName", "src/dirName/fileName" ]) +-- > myFile = $(embedOneFileOf [ "dirName/fileName", "src/dirName/fileName" ]) embedOneFileOf :: [FilePath] -> Q Exp embedOneFileOf ps = (runIO $ readExistingFile ps) >>= \ ( path, content ) -> do @@ -118,6 +119,18 @@ e <- ListE <$> ((runIO $ fileList fp) >>= mapM (pairToExp fp)) return $ SigE e typ +-- | Embed a directory listing recursively in your source code. +-- +-- > myFiles :: [FilePath] +-- > myFiles = $(embedDirListing "dirName") +-- +-- @since 0.0.11 +embedDirListing :: FilePath -> Q Exp +embedDirListing fp = do +typ <- [t| [FilePath] |] +e <- ListE <$> ((runIO $ fmap fst <$> fileList fp) >>= mapM strToExp) +return $ SigE e typ + -- | Get a directory tree in the IO monad. -- -- This is the workhorse of 'embedDir' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.10.1/README.md new/file-embed-0.0.11/README.md --- old/file-embed-0.0.10.1/README.md 2016-04-21 09:42:57.0 +0200 +++ new/file-embed-0.0.11/README.md 2018-07-24 07:28:07.0 +0200 @@ -1,4 +1,8 @@ ## file-embed +[![Build Status](https://travis-ci.org/snoyberg/file-embed.svg?branch=master)](https://travis-ci.org/snoyberg/file-embed) +[![Build status](https://ci.appveyor.com/api/projects/status/vlgo8uudpt374uoy/branch/master?svg=true)](https://ci.appveyor.com/project/snoyberg/file-embed/branch/master) + + Use Template Haskell to read a file or all the files in a directory, and turn them into (path, bytestring) pairs embedded in your haskell code. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.10.1/file-embed.cabal new/file-embed-0.0.11/file-embed.cabal --- old/file-embed-0.0.10.1/file-embed.cabal2017-09-14 11:42:00.0 +0200 +++ new/file-embed-0.0.11/file-embed.cabal 2018-07-29 09:19:51.0 +0200 @@ -1,5 +1,5 @@ name:file-embed -version: 0.0.10.1 +version: 0.0.11 license: BSD3 license-file:LICENSE author: Michael Snoyman diff -urN '--exclude=CVS' '--exclude=.cvsignore'
commit ghc-file-embed for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-file-embed for openSUSE:Factory checked in at 2018-07-24 17:18:44 Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old) and /work/SRC/openSUSE:Factory/.ghc-file-embed.new (New) Package is "ghc-file-embed" Tue Jul 24 17:18:44 2018 rev:7 rq:623772 version:0.0.10.1 Changes: --- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes 2018-05-30 12:25:40.801589843 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new/ghc-file-embed.changes 2018-07-24 17:18:45.899021270 +0200 @@ -1,0 +2,6 @@ +Wed Jul 18 14:26:24 UTC 2018 - psim...@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + +--- @@ -38 +43,0 @@ - Other differences: --
commit ghc-file-embed for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-file-embed for openSUSE:Factory checked in at 2018-05-30 12:07:28 Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old) and /work/SRC/openSUSE:Factory/.ghc-file-embed.new (New) Package is "ghc-file-embed" Wed May 30 12:07:28 2018 rev:6 rq:607797 version:0.0.10.1 Changes: --- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes 2017-09-15 21:39:34.208860660 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new/ghc-file-embed.changes 2018-05-30 12:25:40.801589843 +0200 @@ -1,0 +2,6 @@ +Mon May 14 17:02:11 UTC 2018 - psim...@suse.com + +- Update file-embed to version 0.0.10.1. + * Minor doc improvements + +--- Old: file-embed-0.0.10.tar.gz New: file-embed-0.0.10.1.tar.gz Other differences: -- ++ ghc-file-embed.spec ++ --- /var/tmp/diff_new_pack.JuEdCz/_old 2018-05-30 12:25:41.449568379 +0200 +++ /var/tmp/diff_new_pack.JuEdCz/_new 2018-05-30 12:25:41.453568247 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-file-embed # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -19,7 +19,7 @@ %global pkg_name file-embed %bcond_with tests Name: ghc-%{pkg_name} -Version:0.0.10 +Version:0.0.10.1 Release:0 Summary:Use Template Haskell to embed file contents directly License:BSD-2-Clause @@ -35,7 +35,7 @@ %description Use Template Haskell to read a file or all the files in a directory, and turn -them into (path, bytestring) pairs embedded in your haskell code. +them into (path, bytestring) pairs embedded in your Haskell code. %package devel Summary:Haskell %{pkg_name} library development files @@ -67,7 +67,7 @@ %ghc_pkg_recache %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %doc ChangeLog.md README.md ++ file-embed-0.0.10.tar.gz -> file-embed-0.0.10.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.10/ChangeLog.md new/file-embed-0.0.10.1/ChangeLog.md --- old/file-embed-0.0.10/ChangeLog.md 2016-04-21 17:33:11.0 +0200 +++ new/file-embed-0.0.10.1/ChangeLog.md2017-09-14 11:42:06.0 +0200 @@ -1,3 +1,7 @@ +## 0.0.10.1 + +* Minor doc improvements + ## 0.0.10 * `makeRelativeToProject` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.10/Data/FileEmbed.hs new/file-embed-0.0.10.1/Data/FileEmbed.hs --- old/file-embed-0.0.10/Data/FileEmbed.hs 2016-04-21 17:33:11.0 +0200 +++ new/file-embed-0.0.10.1/Data/FileEmbed.hs 2017-09-14 09:58:52.0 +0200 @@ -353,7 +353,7 @@ -- root directory for fixing the relative path. -- -- @@@ --- $(makeRelativeToProject "data/foo.txt" >>= fileEmbed) +-- $(makeRelativeToProject "data/foo.txt" >>= embedFile) -- @@@ -- -- @since 0.0.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.10/file-embed.cabal new/file-embed-0.0.10.1/file-embed.cabal --- old/file-embed-0.0.10/file-embed.cabal 2016-04-21 17:33:11.0 +0200 +++ new/file-embed-0.0.10.1/file-embed.cabal2017-09-14 11:42:00.0 +0200 @@ -1,5 +1,5 @@ name:file-embed -version: 0.0.10 +version: 0.0.10.1 license: BSD3 license-file:LICENSE author: Michael Snoyman @@ -7,7 +7,7 @@ synopsis:Use Template Haskell to embed file contents directly. description: Use Template Haskell to read a file or all the files in a directory, and turn them into (path, bytestring) pairs - embedded in your haskell code. + embedded in your Haskell code. category:Data stability: Stable cabal-version: >= 1.8
commit ghc-file-embed for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-file-embed for openSUSE:Factory checked in at 2017-09-15 21:39:34 Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old) and /work/SRC/openSUSE:Factory/.ghc-file-embed.new (New) Package is "ghc-file-embed" Fri Sep 15 21:39:34 2017 rev:5 rq:524513 version:0.0.10 Changes: --- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes 2016-07-21 08:12:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new/ghc-file-embed.changes 2017-09-15 21:39:34.208860660 +0200 @@ -1,0 +2,5 @@ +Thu Aug 3 15:38:38 UTC 2017 - psim...@suse.com + +- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. + +--- Other differences: -- ++ ghc-file-embed.spec ++ --- /var/tmp/diff_new_pack.WdDBul/_old 2017-09-15 21:39:34.920760355 +0200 +++ /var/tmp/diff_new_pack.WdDBul/_new 2017-09-15 21:39:34.920760355 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-file-embed # -# 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 @@ -23,18 +23,15 @@ Release:0 Summary:Use Template Haskell to embed file contents directly License:BSD-2-Clause -Group: System/Libraries -Url:https://hackage.haskell.org/package/%{pkg_name} +Group: Development/Libraries/Haskell +URL:https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps %description Use Template Haskell to read a file or all the files in a directory, and turn @@ -42,7 +39,7 @@ %package devel Summary:Haskell %{pkg_name} library development files -Group: Development/Libraries/Other +Group: Development/Libraries/Haskell Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} @@ -54,20 +51,14 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache @@ -76,11 +67,9 @@ %ghc_pkg_recache %files -f %{name}.files -%defattr(-,root,root,-) %doc LICENSE %files devel -f %{name}-devel.files -%defattr(-,root,root,-) %doc ChangeLog.md README.md %changelog
commit ghc-file-embed for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-file-embed for openSUSE:Factory checked in at 2016-07-21 08:12:41 Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old) and /work/SRC/openSUSE:Factory/.ghc-file-embed.new (New) Package is "ghc-file-embed" Changes: --- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes 2016-04-30 23:30:19.0 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new/ghc-file-embed.changes 2016-07-21 08:12:44.0 +0200 @@ -1,0 +2,5 @@ +Sun Jul 10 17:15:55 UTC 2016 - psim...@suse.com + +- Update to version 0.0.10 revision 0 with cabal2obs. + +--- Other differences: -- ++ ghc-file-embed.spec ++ --- /var/tmp/diff_new_pack.4IOemk/_old 2016-07-21 08:12:45.0 +0200 +++ /var/tmp/diff_new_pack.4IOemk/_new 2016-07-21 08:12:45.0 +0200 @@ -17,63 +17,58 @@ %global pkg_name file-embed - -%bcond_without tests - -Name: ghc-file-embed +%bcond_with tests +Name: ghc-%{pkg_name} Version:0.0.10 Release:0 Summary:Use Template Haskell to embed file contents directly License:BSD-2-Clause Group: System/Libraries - Url:https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel +BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel -%if %{with tests} -BuildRequires: ghc-HUnit-devel -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps %description Use Template Haskell to read a file or all the files in a directory, and turn them into (path, bytestring) pairs embedded in your haskell code. - %package devel Summary:Haskell %{pkg_name} library development files Group: Development/Libraries/Other +Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: %{name} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. - %prep %setup -q -n %{pkg_name}-%{version} + %build %ghc_lib_build + %install %ghc_lib_install + %check %if %{with tests} -%cabal test +%{cabal} test %endif + %post devel %ghc_pkg_recache @@ -86,6 +81,6 @@ %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.md +%doc ChangeLog.md README.md %changelog
commit ghc-file-embed for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-file-embed for openSUSE:Factory checked in at 2016-04-30 23:30:18 Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old) and /work/SRC/openSUSE:Factory/.ghc-file-embed.new (New) Package is "ghc-file-embed" Changes: --- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes 2016-01-28 17:25:30.0 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new/ghc-file-embed.changes 2016-04-30 23:30:19.0 +0200 @@ -1,0 +2,6 @@ +Tue Apr 26 08:25:43 UTC 2016 - mimi...@gmail.com + +- update to 0.0.10 +* makeRelativeToProject + +--- Old: file-embed-0.0.9.1.tar.gz New: file-embed-0.0.10.tar.gz Other differences: -- ++ ghc-file-embed.spec ++ --- /var/tmp/diff_new_pack.V9LzF2/_old 2016-04-30 23:30:20.0 +0200 +++ /var/tmp/diff_new_pack.V9LzF2/_new 2016-04-30 23:30:20.0 +0200 @@ -21,7 +21,7 @@ %bcond_without tests Name: ghc-file-embed -Version:0.0.9.1 +Version:0.0.10 Release:0 Summary:Use Template Haskell to embed file contents directly License:BSD-2-Clause ++ file-embed-0.0.9.1.tar.gz -> file-embed-0.0.10.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.9.1/ChangeLog.md new/file-embed-0.0.10/ChangeLog.md --- old/file-embed-0.0.9.1/ChangeLog.md 2016-01-20 08:30:52.0 +0100 +++ new/file-embed-0.0.10/ChangeLog.md 2016-04-21 17:33:11.0 +0200 @@ -1,3 +1,7 @@ +## 0.0.10 + +* `makeRelativeToProject` + ## 0.0.9 * embedStringFile [#14](https://github.com/snoyberg/file-embed/pull/14) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.9.1/Data/FileEmbed.hs new/file-embed-0.0.10/Data/FileEmbed.hs --- old/file-embed-0.0.9.1/Data/FileEmbed.hs2016-01-20 08:30:52.0 +0100 +++ new/file-embed-0.0.10/Data/FileEmbed.hs 2016-04-21 17:33:11.0 +0200 @@ -35,6 +35,8 @@ , injectFile , injectWith , injectFileWith + -- * Relative path manipulation +, makeRelativeToProject -- * Internal , stringToBs , bsToExp @@ -50,12 +52,13 @@ #endif , Q , runIO +, qLocation, loc_filename #if MIN_VERSION_template_haskell(2,7,0) , Quasi(qAddDependentFile) #endif ) import System.Directory (doesDirectoryExist, doesFileExist, - getDirectoryContents) + getDirectoryContents, canonicalizePath) import Control.Exception (throw, ErrorCall(..)) import Control.Monad (filterM) import qualified Data.ByteString as B @@ -64,7 +67,7 @@ import Control.Applicative ((<$>)) import Data.ByteString.Unsafe (unsafePackAddressLen) import System.IO.Unsafe (unsafePerformIO) -import System.FilePath (()) +import System.FilePath ((), takeDirectory, takeExtension) import Data.String (fromString) import Prelude as P @@ -336,3 +339,42 @@ available, you can use the non-@With@ variants. -} + +-- | Take a relative file path and attach it to the root of the current +-- project. +-- +-- The idea here is that, when building with Stack, the build will always be +-- executed with a current working directory of the root of the project (where +-- your .cabal file is located). However, if you load up multiple projects with +-- @stack ghci@, the working directory may be something else entirely. +-- +-- This function looks at the source location of the Haskell file calling it, +-- finds the first parent directory with a .cabal file, and uses that as the +-- root directory for fixing the relative path. +-- +-- @@@ +-- $(makeRelativeToProject "data/foo.txt" >>= fileEmbed) +-- @@@ +-- +-- @since 0.0.10 +makeRelativeToProject :: FilePath -> Q FilePath +makeRelativeToProject rel = do +loc <- qLocation +runIO $ do +srcFP <- canonicalizePath $ loc_filename loc +mdir <- findProjectDir srcFP +case mdir of +Nothing -> error $ "Could not find .cabal file for path: " ++ srcFP +Just dir -> return $ dir rel + where +findProjectDir x = do +let dir = takeDirectory x +if dir == x +then return Nothing +else do +contents <- getDirectoryContents dir +if any isCabalFile contents +then return (Just dir) +else findProjectDir dir + +isCabalFile fp = takeExtension fp == ".cabal" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.9.1/file-embed.cabal
commit ghc-file-embed for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-file-embed for openSUSE:Factory checked in at 2016-01-28 17:24:30 Comparing /work/SRC/openSUSE:Factory/ghc-file-embed (Old) and /work/SRC/openSUSE:Factory/.ghc-file-embed.new (New) Package is "ghc-file-embed" Changes: --- /work/SRC/openSUSE:Factory/ghc-file-embed/ghc-file-embed.changes 2015-11-26 17:03:40.0 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-file-embed.new/ghc-file-embed.changes 2016-01-28 17:25:30.0 +0100 @@ -1,0 +2,6 @@ +Fri Jan 22 08:46:18 UTC 2016 - mimi...@gmail.com + +- update to 0.0.9.1 +* embedStringFile + +--- Old: file-embed-0.0.9.tar.gz New: file-embed-0.0.9.1.tar.gz Other differences: -- ++ ghc-file-embed.spec ++ --- /var/tmp/diff_new_pack.2xHCuS/_old 2016-01-28 17:25:30.0 +0100 +++ /var/tmp/diff_new_pack.2xHCuS/_new 2016-01-28 17:25:30.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-file-embed # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -21,7 +21,7 @@ %bcond_without tests Name: ghc-file-embed -Version:0.0.9 +Version:0.0.9.1 Release:0 Summary:Use Template Haskell to embed file contents directly License:BSD-2-Clause ++ file-embed-0.0.9.tar.gz -> file-embed-0.0.9.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.9/Data/FileEmbed.hs new/file-embed-0.0.9.1/Data/FileEmbed.hs --- old/file-embed-0.0.9/Data/FileEmbed.hs 2015-08-14 06:52:02.0 +0200 +++ new/file-embed-0.0.9.1/Data/FileEmbed.hs2016-01-20 08:30:52.0 +0100 @@ -3,7 +3,7 @@ {-# LANGUAGE OverloadedStrings #-} -- | This module uses template Haskell. Following is a simplified explanation of usage for those unfamiliar with calling Template Haskell functions. -- --- The function @embedFile@ in this modules embeds a file into the exceutable +-- The function @embedFile@ in this modules embeds a file into the executable -- that you can use it at runtime. A file is represented as a @ByteString@. -- However, as you can see below, the type signature indicates a value of type -- @Q Exp@ will be returned. In order to convert this into a @ByteString@, you diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.9/file-embed.cabal new/file-embed-0.0.9.1/file-embed.cabal --- old/file-embed-0.0.9/file-embed.cabal 2015-08-14 06:52:02.0 +0200 +++ new/file-embed-0.0.9.1/file-embed.cabal 2016-01-20 08:30:52.0 +0100 @@ -1,5 +1,5 @@ name:file-embed -version: 0.0.9 +version: 0.0.9.1 license: BSD3 license-file:LICENSE author: Michael Snoyman@@ -32,7 +32,6 @@ hs-source-dirs: test build-depends: base , file-embed - , HUnit , filepath source-repository head diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/file-embed-0.0.9/test/main.hs new/file-embed-0.0.9.1/test/main.hs --- old/file-embed-0.0.9/test/main.hs 2015-08-14 06:52:02.0 +0200 +++ new/file-embed-0.0.9.1/test/main.hs 2016-01-20 08:30:52.0 +0100 @@ -1,10 +1,15 @@ {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE OverloadedStrings #-} +import Control.Monad (unless) import Data.FileEmbed -import Test.HUnit ((@?=)) import System.FilePath (()) +infix 1 @?= + +(@?=) :: (Eq a, Show a) => a -> a -> IO () +actual @?= expected = unless (actual == expected) (error $ "expected: " ++ show expected ++ "\n but got: " ++ show actual) + main :: IO () main = do let received = $(embedDir "test/sample")