haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into wai-2.0

Browse Source
This commit is contained in:
Michael Snoyman 2013-09-08 14:25:10 +02:00
commit 8ae0b789e1
12 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-auth/yesod-auth.cabal
View File

@ -1,5 +1,5 @@
name: yesod-auth name: yesod-auth
version: 1.2.2 version: 1.2.2.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman, Patrick Brisbin author: Michael Snoyman, Patrick Brisbin
@ -29,7 +29,7 @@ library
, yesod-persistent >= 1.2 , yesod-persistent >= 1.2
, hamlet >= 1.1 && < 1.2 , hamlet >= 1.1 && < 1.2
, shakespeare-css >= 1.0 && < 1.1 , shakespeare-css >= 1.0 && < 1.1
, shakespeare-js >= 1.0.2 && < 1.2 , shakespeare-js >= 1.0.2 && < 1.3
, containers , containers
, unordered-containers , unordered-containers
, yesod-form >= 1.3 && < 1.4 , yesod-form >= 1.3 && < 1.4

3
yesod-bin/hsfiles/mongo.hsfiles
View File

@ -376,7 +376,6 @@ library
DeriveDataTypeable DeriveDataTypeable
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
-- , yesod-platform >= 1.1 && < 1.2
, yesod >= 1.2 && < 1.3 , yesod >= 1.2 && < 1.3
, yesod-core >= 1.2 && < 1.3 , yesod-core >= 1.2 && < 1.3
, yesod-auth >= 1.2 && < 1.3 , yesod-auth >= 1.2 && < 1.3
@ -390,7 +389,7 @@ library
, template-haskell , template-haskell
, hamlet >= 1.1 && < 1.2 , hamlet >= 1.1 && < 1.2
, shakespeare-css >= 1.0 && < 1.1 , shakespeare-css >= 1.0 && < 1.1
, shakespeare-js >= 1.0.2 && < 1.2 , shakespeare-js >= 1.2 && < 1.3
, shakespeare-text >= 1.0 && < 1.1 , shakespeare-text >= 1.0 && < 1.1
, hjsmin >= 0.1 && < 0.2 , hjsmin >= 0.1 && < 0.2
, monad-control >= 0.3 && < 0.4 , monad-control >= 0.3 && < 0.4

3
yesod-bin/hsfiles/mysql.hsfiles
View File

@ -380,7 +380,6 @@ library
DeriveDataTypeable DeriveDataTypeable
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
-- , yesod-platform >= 1.1 && < 1.2
, yesod >= 1.2 && < 1.3 , yesod >= 1.2 && < 1.3
, yesod-core >= 1.2 && < 1.3 , yesod-core >= 1.2 && < 1.3
, yesod-auth >= 1.2 && < 1.3 , yesod-auth >= 1.2 && < 1.3
@ -394,7 +393,7 @@ library
, template-haskell , template-haskell
, hamlet >= 1.1 && < 1.2 , hamlet >= 1.1 && < 1.2
, shakespeare-css >= 1.0 && < 1.1 , shakespeare-css >= 1.0 && < 1.1
, shakespeare-js >= 1.0.2 && < 1.2 , shakespeare-js >= 1.2 && < 1.3
, shakespeare-text >= 1.0 && < 1.1 , shakespeare-text >= 1.0 && < 1.1
, hjsmin >= 0.1 && < 0.2 , hjsmin >= 0.1 && < 0.2
, monad-control >= 0.3 && < 0.4 , monad-control >= 0.3 && < 0.4

3
yesod-bin/hsfiles/postgres-fay.hsfiles
View File

@ -416,7 +416,6 @@ library
DeriveDataTypeable DeriveDataTypeable
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
-- , yesod-platform >= 1.1 && < 1.2
, yesod >= 1.2 && < 1.3 , yesod >= 1.2 && < 1.3
, yesod-core >= 1.2 && < 1.3 , yesod-core >= 1.2 && < 1.3
, yesod-auth >= 1.2 && < 1.3 , yesod-auth >= 1.2 && < 1.3
@ -432,7 +431,7 @@ library
, template-haskell , template-haskell
, hamlet >= 1.1 && < 1.2 , hamlet >= 1.1 && < 1.2
, shakespeare-css >= 1.0 && < 1.1 , shakespeare-css >= 1.0 && < 1.1
, shakespeare-js >= 1.0.2 && < 1.2 , shakespeare-js >= 1.2 && < 1.3
, shakespeare-text >= 1.0 && < 1.1 , shakespeare-text >= 1.0 && < 1.1
, monad-control >= 0.3 && < 0.4 , monad-control >= 0.3 && < 0.4
, wai-extra >= 1.3 && < 1.4 , wai-extra >= 1.3 && < 1.4

3
yesod-bin/hsfiles/postgres.hsfiles
View File

@ -380,7 +380,6 @@ library
DeriveDataTypeable DeriveDataTypeable
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
-- , yesod-platform >= 1.1 && < 1.2
, yesod >= 1.2 && < 1.3 , yesod >= 1.2 && < 1.3
, yesod-core >= 1.2 && < 1.3 , yesod-core >= 1.2 && < 1.3
, yesod-auth >= 1.2 && < 1.3 , yesod-auth >= 1.2 && < 1.3
@ -394,7 +393,7 @@ library
, template-haskell , template-haskell
, hamlet >= 1.1 && < 1.2 , hamlet >= 1.1 && < 1.2
, shakespeare-css >= 1.0 && < 1.1 , shakespeare-css >= 1.0 && < 1.1
, shakespeare-js >= 1.0.2 && < 1.2 , shakespeare-js >= 1.2 && < 1.3
, shakespeare-text >= 1.0 && < 1.1 , shakespeare-text >= 1.0 && < 1.1
, hjsmin >= 0.1 && < 0.2 , hjsmin >= 0.1 && < 0.2
, monad-control >= 0.3 && < 0.4 , monad-control >= 0.3 && < 0.4

3
yesod-bin/hsfiles/simple.hsfiles
View File

@ -310,7 +310,6 @@ library
DeriveDataTypeable DeriveDataTypeable
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
-- , yesod-platform >= 1.1 && < 1.2
, yesod >= 1.2 && < 1.3 , yesod >= 1.2 && < 1.3
, yesod-core >= 1.2 && < 1.3 , yesod-core >= 1.2 && < 1.3
, yesod-auth >= 1.2 && < 1.3 , yesod-auth >= 1.2 && < 1.3
@ -321,7 +320,7 @@ library
, template-haskell , template-haskell
, hamlet >= 1.1 && < 1.2 , hamlet >= 1.1 && < 1.2
, shakespeare-css >= 1.0 && < 1.1 , shakespeare-css >= 1.0 && < 1.1
, shakespeare-js >= 1.0.2 && < 1.2 , shakespeare-js >= 1.2 && < 1.3
, shakespeare-text >= 1.0 && < 1.1 , shakespeare-text >= 1.0 && < 1.1
, hjsmin >= 0.1 && < 0.2 , hjsmin >= 0.1 && < 0.2
, monad-control >= 0.3 && < 0.4 , monad-control >= 0.3 && < 0.4

3
yesod-bin/hsfiles/sqlite.hsfiles
View File

@ -380,7 +380,6 @@ library
DeriveDataTypeable DeriveDataTypeable
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
-- , yesod-platform >= 1.1 && < 1.2
, yesod >= 1.2 && < 1.3 , yesod >= 1.2 && < 1.3
, yesod-core >= 1.2 && < 1.3 , yesod-core >= 1.2 && < 1.3
, yesod-auth >= 1.2 && < 1.3 , yesod-auth >= 1.2 && < 1.3
@ -394,7 +393,7 @@ library
, template-haskell , template-haskell
, hamlet >= 1.1 && < 1.2 , hamlet >= 1.1 && < 1.2
, shakespeare-css >= 1.0 && < 1.1 , shakespeare-css >= 1.0 && < 1.1
, shakespeare-js >= 1.0.2 && < 1.2 , shakespeare-js >= 1.2 && < 1.3
, shakespeare-text >= 1.0 && < 1.1 , shakespeare-text >= 1.0 && < 1.1
, hjsmin >= 0.1 && < 0.2 , hjsmin >= 0.1 && < 0.2
, monad-control >= 0.3 && < 0.4 , monad-control >= 0.3 && < 0.4

6
yesod-bin/yesod-bin.cabal
View File

@ -1,5 +1,5 @@
name: yesod-bin name: yesod-bin
version: 1.2.3 version: 1.2.3.2
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -50,8 +50,8 @@ executable yesod
, parsec >= 2.1 && < 4 , parsec >= 2.1 && < 4
, text >= 0.11 , text >= 0.11
, shakespeare-text >= 1.0 && < 1.1 , shakespeare-text >= 1.0 && < 1.1
, shakespeare >= 1.0.2 && < 1.1 , shakespeare >= 1.0.2 && < 1.3
, shakespeare-js >= 1.0.2 && < 1.2 , shakespeare-js >= 1.0.2 && < 1.3
, shakespeare-css >= 1.0.2 && < 1.1 , shakespeare-css >= 1.0.2 && < 1.1
, bytestring >= 0.9.1.4 , bytestring >= 0.9.1.4
, time >= 1.1.4 , time >= 1.1.4

6
yesod-core/yesod-core.cabal
View File

@ -1,5 +1,5 @@
name: yesod-core name: yesod-core
version: 1.2.4.1 version: 1.2.4.2
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -33,8 +33,8 @@ library
, template-haskell , template-haskell
, path-pieces >= 0.1.2 && < 0.2 , path-pieces >= 0.1.2 && < 0.2
, hamlet >= 1.1 && < 1.2 , hamlet >= 1.1 && < 1.2
, shakespeare >= 1.0 && < 1.1 , shakespeare >= 1.0 && < 1.3
, shakespeare-js >= 1.0.2 && < 1.2 , shakespeare-js >= 1.0.2 && < 1.3
, shakespeare-css >= 1.0 && < 1.1 , shakespeare-css >= 1.0 && < 1.1
, shakespeare-i18n >= 1.0 && < 1.1 , shakespeare-i18n >= 1.0 && < 1.1
, blaze-builder >= 0.2.1.4 && < 0.4 , blaze-builder >= 0.2.1.4 && < 0.4

4
yesod-form/yesod-form.cabal
View File

@ -1,5 +1,5 @@
name: yesod-form name: yesod-form
version: 1.3.2 version: 1.3.2.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -19,7 +19,7 @@ library
, time >= 1.1.4 , time >= 1.1.4
, hamlet >= 1.1 && < 1.2 , hamlet >= 1.1 && < 1.2
, shakespeare-css >= 1.0 && < 1.1 , shakespeare-css >= 1.0 && < 1.1
, shakespeare-js >= 1.0.2 && < 1.2 , shakespeare-js >= 1.0.2 && < 1.3
, persistent >= 1.2 && < 1.3 , persistent >= 1.2 && < 1.3
, template-haskell , template-haskell
, transformers >= 0.2.2 , transformers >= 0.2.2

22
yesod-platform/yesod-platform.cabal
View File

@ -1,5 +1,5 @@
name: yesod-platform name: yesod-platform
version: 1.2.4 version: 1.2.4.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -63,7 +63,7 @@ library
, fast-logger == 0.3.3 , fast-logger == 0.3.3
, file-embed == 0.0.4.9 , file-embed == 0.0.4.9
, filesystem-conduit == 1.0.0.1 , filesystem-conduit == 1.0.0.1
, hamlet == 1.1.7.1 , hamlet == 1.1.7.2
, hjsmin == 0.1.4.1 , hjsmin == 0.1.4.1
, hspec == 1.7.2 , hspec == 1.7.2
, hspec-expectations == 0.3.3 , hspec-expectations == 0.3.3
@ -96,11 +96,11 @@ library
, securemem == 0.1.3 , securemem == 0.1.3
, semigroups == 0.9.2 , semigroups == 0.9.2
, setenv == 0.1.0 , setenv == 0.1.0
, shakespeare == 1.0.5.1 , shakespeare == 1.2.0
, shakespeare-css == 1.0.6.2 , shakespeare-css == 1.0.6.3
, shakespeare-i18n == 1.0.0.3 , shakespeare-i18n == 1.0.0.4
, shakespeare-js == 1.1.4.1 , shakespeare-js == 1.2.0
, shakespeare-text == 1.0.0.6 , shakespeare-text == 1.0.0.7
, silently == 1.2.4.1 , silently == 1.2.4.1
, simple-sendfile == 0.2.12 , simple-sendfile == 0.2.12
, skein == 1.0.6 , skein == 1.0.6
@ -132,10 +132,10 @@ library
, xml-types == 0.3.4 , xml-types == 0.3.4
, xss-sanitize == 0.3.4 , xss-sanitize == 0.3.4
, yaml == 0.8.4.1 , yaml == 0.8.4.1
, yesod == 1.2.2 , yesod == 1.2.2.1
, yesod-auth == 1.2.2 , yesod-auth == 1.2.2.1
, yesod-core == 1.2.4.1 , yesod-core == 1.2.4.2
, yesod-form == 1.3.2 , yesod-form == 1.3.2.1
, yesod-persistent == 1.2.1 , yesod-persistent == 1.2.1
, yesod-routes == 1.2.0.1 , yesod-routes == 1.2.0.1
, yesod-static == 1.2.0.1 , yesod-static == 1.2.0.1

4
yesod/yesod.cabal
View File

@ -1,5 +1,5 @@
name: yesod name: yesod
version: 1.2.2 version: 1.2.2.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -31,7 +31,7 @@ library
, wai >= 1.3 , wai >= 1.3
, wai-extra >= 1.3 , wai-extra >= 1.3
, hamlet >= 1.1 && < 1.2 , hamlet >= 1.1 && < 1.2
, shakespeare-js >= 1.0.2 && < 1.2 , shakespeare-js >= 1.0.2 && < 1.3
, shakespeare-css >= 1.0 && < 1.1 , shakespeare-css >= 1.0 && < 1.1
, warp >= 1.3 , warp >= 1.3
, blaze-html >= 0.5 , blaze-html >= 0.5