yesod 1.0.1.5 → 1.0.1.6
raw patch · 5 files changed
+34/−26 lines, 5 filesdep ~bytestringdep ~containersbinary-addedPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: bytestring, containers
API changes (from Hackage documentation)
Files
- LICENSE +17/−22
- Scaffolding/Scaffolder.hs +11/−0
- scaffold/static/img/glyphicons-halflings-white.png binary
- scaffold/static/img/glyphicons-halflings.png binary
- yesod.cabal +6/−4
LICENSE view
@@ -1,25 +1,20 @@-The following license covers this documentation, and the source code, except-where otherwise indicated.--Copyright 2010, Michael Snoyman. All rights reserved.--Redistribution and use in source and binary forms, with or without-modification, are permitted provided that the following conditions are met:+Copyright (c) 2012 Michael Snoyman, http://www.yesodweb.com/ -* Redistributions of source code must retain the above copyright notice, this- list of conditions and the following disclaimer.+Permission is hereby granted, free of charge, to any person obtaining+a copy of this software and associated documentation files (the+"Software"), to deal in the Software without restriction, including+without limitation the rights to use, copy, modify, merge, publish,+distribute, sublicense, and/or sell copies of the Software, and to+permit persons to whom the Software is furnished to do so, subject to+the following conditions: -* Redistributions in binary form must reproduce the above copyright notice,- this list of conditions and the following disclaimer in the documentation- and/or other materials provided with the distribution.+The above copyright notice and this permission notice shall be+included in all copies or substantial portions of the Software. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO-EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Scaffolding/Scaffolder.hs view
@@ -126,6 +126,7 @@ mkDir "templates" mkDir "static" mkDir "static/css"+ mkDir "static/img" mkDir "static/js" mkDir "config" mkDir "Model"@@ -156,8 +157,18 @@ writeFile' "Settings.hs" $(codegen "Settings.hs") writeFile' "Settings/StaticFiles.hs" $(codegen "Settings/StaticFiles.hs") writeFile' "Settings/Development.hs" $(codegen "Settings/Development.hs")+ writeFile' "static/css/bootstrap.css" $(codegen "static/css/bootstrap.css")+ S.writeFile (dir ++ "/static/img/glyphicons-halflings.png")+ $(runIO (S.readFile "scaffold/static/img/glyphicons-halflings.png") >>= \bs -> do+ pack <- [|S.pack|]+ return $ pack `AppE` LitE (StringL $ S.unpack bs))+ S.writeFile (dir ++ "/static/img/glyphicons-halflings-white.png")+ $(runIO (S.readFile "scaffold/static/img/glyphicons-halflings-white.png") >>= \bs -> do+ pack <- [|S.pack|]+ return $ pack `AppE` LitE (StringL $ S.unpack bs))+ writeFile' "templates/default-layout.hamlet" $(codegen "templates/default-layout.hamlet") writeFile' "templates/default-layout-wrapper.hamlet"
+ scaffold/static/img/glyphicons-halflings-white.png view
binary file changed (absent → 8777 bytes)
+ scaffold/static/img/glyphicons-halflings.png view
binary file changed (absent → 13826 bytes)
yesod.cabal view
@@ -1,5 +1,5 @@ name: yesod-version: 1.0.1.5+version: 1.0.1.6 license: MIT license-file: LICENSE author: Michael Snoyman <michael@snoyman.com>@@ -38,6 +38,8 @@ scaffold/deploy/Procfile.cg scaffold/templates/homepage.hamlet.cg scaffold/static/css/bootstrap.css.cg+ scaffold/static/img/glyphicons-halflings.png+ scaffold/static/img/glyphicons-halflings-white.png scaffold/templates/default-layout.hamlet.cg scaffold/templates/homepage.julius.cg scaffold/templates/default-layout-wrapper.hamlet.cg@@ -62,7 +64,7 @@ flag blaze_html_0_5 description: use blaze-html 0.5 and blaze-markup 0.5- default: False+ default: True library build-depends: base >= 4.3 && < 5@@ -99,13 +101,13 @@ , parsec >= 2.1 && < 4 , text >= 0.11 && < 0.12 , shakespeare-text >= 1.0 && < 1.1- , bytestring >= 0.9.1.4 && < 0.10+ , bytestring >= 0.9.1.4 , time >= 1.1.4 , template-haskell , directory >= 1.0 && < 1.2 , Cabal , unix-compat >= 0.2 && < 0.4- , containers >= 0.2 && < 0.5+ , containers >= 0.2 , attoparsec >= 0.10 , http-types >= 0.6.1 && < 0.7 , blaze-builder >= 0.2.1.4 && < 0.4