Skip to content
Browse files

Merge branch 'master' into 0.10

Conflicts:
	project_template/default/foo.cabal
	snap.cabal
	test/snap-testsuite.cabal
  • Loading branch information...
2 parents 8e07db9 + 23c9558 commit f3c5e453fb339d7bf9b1adea99a6b8f6077b9919 @gregorycollins gregorycollins committed Oct 3, 2012
View
2 project_template/barebones/foo.cabal
@@ -16,7 +16,7 @@ Executable projname
Build-depends:
base >= 4 && < 5,
- bytestring >= 0.9.1 && < 0.10,
+ bytestring >= 0.9.1 && < 0.11,
MonadCatchIO-transformers >= 0.2.1 && < 0.4,
mtl >= 2 && < 3,
snap-core >= 0.9.2 && < 0.10,
View
8 project_template/default/foo.cabal
@@ -19,11 +19,11 @@ Executable projname
main-is: Main.hs
Build-depends:
- base >= 4 && < 5,
- bytestring >= 0.9.1 && < 0.10,
+ base >= 4 && < 5,
+ bytestring >= 0.9.1 && < 0.11,
data-lens >= 2.0.1 && < 2.11,
- data-lens-template >= 2.1 && < 2.2,
- heist >= 0.10 && < 0.11,
+ data-lens-template >= 2.1 && < 2.2,
+ heist >= 0.10 && < 0.11,
MonadCatchIO-transformers >= 0.2.1 && < 0.4,
mtl >= 2 && < 3,
snap >= 0.10 && < 0.11,
View
2 project_template/tutorial/foo.cabal
@@ -16,7 +16,7 @@ Executable projname
Build-depends:
base >= 4 && < 5,
- bytestring >= 0.9.1 && < 0.10,
+ bytestring >= 0.9.1 && < 0.11,
MonadCatchIO-transformers >= 0.2.1 && < 0.4,
mtl >= 2 && < 3,
snap >= 0.10 && < 0.11,
View
4 snap.cabal
@@ -150,7 +150,7 @@ Library
comonad >= 1.1 && < 3.1,
containers >= 0.3 && < 0.6,
directory >= 1.0 && < 1.3,
- directory-tree >= 0.10 && < 0.11,
+ directory-tree >= 0.10 && < 0.12,
data-lens >= 2.0.1 && < 2.11,
data-lens-template >= 2.1 && < 2.2,
dlist >= 0.5 && < 0.6,
@@ -172,7 +172,7 @@ Library
transformers >= 0.2 && < 0.4,
unordered-containers >= 0.1.4 && < 0.3,
utf8-string >= 0.3 && < 0.4,
- vector >= 0.7.1 && < 0.10,
+ vector >= 0.7.1 && < 0.11,
vector-algorithms >= 0.4 && < 0.6,
xmlhtml >= 0.1 && < 0.3
View
61 test/snap-testsuite.cabal
@@ -8,46 +8,46 @@ Executable snap-testsuite
main-is: TestSuite.hs
build-depends:
- Glob >= 0.5 && < 0.8,
- HUnit >= 1.2 && < 2,
- MonadCatchIO-transformers >= 0.2 && < 0.4,
+ Glob >= 0.5 && < 0.8,
+ HUnit >= 1.2 && < 2,
+ MonadCatchIO-transformers >= 0.2 && < 0.4,
QuickCheck >= 2.3.0.2,
- attoparsec >= 0.10 && <0.11,
- aeson >= 0.6 && <0.7,
- base >= 4 && < 5,
- bytestring >= 0.9 && < 0.10,
- cereal >= 0.3 && < 0.4,
- clientsession >= 0.7 && < 0.8,
- comonad >= 3.0 && < 3.1,
- configurator >= 0.1 && < 0.3,
+ aeson >= 0.6 && < 0.7,
+ attoparsec >= 0.10 && < 0.11,
+ base >= 4 && < 5,
+ bytestring >= 0.9 && < 0.11,
+ cereal >= 0.3 && < 0.4,
+ clientsession >= 0.7 && < 0.8,
+ comonad >= 3.0 && < 3.1,
+ configurator >= 0.1 && < 0.3,
containers >= 0.3,
- data-lens >= 2.0.1 && < 2.11,
- data-lens-template >= 2.1.1 && < 2.2,
+ data-lens >= 2.0.1 && < 2.11,
+ data-lens-template >= 2.1.1 && < 2.2,
directory,
- directory-tree >= 0.10 && < 0.11,
- dlist >= 0.5 && < 0.6,
- errors >= 1.3.1 && < 1.4,
+ directory-tree >= 0.10 && < 0.12,
+ dlist >= 0.5 && < 0.6,
+ errors >= 1.3.1 && < 1.4,
filepath,
hashable >= 1.1,
- heist >= 0.10 && < 0.11,
- http-conduit >= 1.4 && < 1.7,
- http-types >= 0.6 && < 0.8,
+ heist >= 0.10 && < 0.11,
+ http-conduit >= 1.4 && < 1.7,
+ http-types >= 0.6 && < 0.8,
mtl >= 2,
mwc-random >= 0.8,
process == 1.*,
pwstore-fast == 2.*,
snap-core >= 0.9 && < 0.10,
snap-server >= 0.9 && < 0.10,
syb >= 0.1,
- test-framework >= 0.6 && <0.7,
- test-framework-hunit >= 0.2.7 && <0.3,
- test-framework-quickcheck2 >= 0.2.12.1 && <0.3,
- text >= 0.11 && < 0.12,
+ test-framework >= 0.6 && < 0.7,
+ test-framework-hunit >= 0.2.7 && < 0.3,
+ test-framework-quickcheck2 >= 0.2.12.1 && < 0.3,
+ text >= 0.11 && < 0.12,
time >= 1.1,
transformers >= 0.2,
- unix >= 2.2.0.0 && < 2.7,
+ unix >= 2.2.0.0 && < 2.7,
unordered-containers >= 0.1.4,
- utf8-string >= 0.3 && < 0.4,
+ utf8-string >= 0.3 && < 0.4,
template-haskell
extensions:
@@ -81,7 +81,7 @@ Executable app
MonadCatchIO-transformers >= 0.2 && < 0.4,
attoparsec >= 0.10 && < 0.11,
base >= 4 && < 5,
- bytestring >= 0.9 && < 0.10,
+ bytestring >= 0.9 && < 0.11,
cereal >= 0.3 && < 0.4,
clientsession >= 0.7.3.6 && < 0.9,
comonad >= 3.0 && < 3.1,
@@ -90,7 +90,7 @@ Executable app
data-lens >= 2.0.1 && < 2.11,
data-lens-template >= 2.1.1 && < 2.2,
directory,
- directory-tree >= 0.10 && < 0.11,
+ directory-tree >= 0.10 && < 0.12,
dlist >= 0.5 && < 0.6,
errors >= 1.3.1 && < 1.4,
filepath,
@@ -137,13 +137,14 @@ Executable nesttest
main-is: NestTest.hs
build-depends:
+<<<<<<< HEAD
Glob >= 0.5 && < 0.8,
HUnit >= 1.2 && < 2,
MonadCatchIO-transformers >= 0.2 && < 0.4,
QuickCheck >= 2.3.0.2,
- attoparsec >= 0.10 && <0.11,
+ attoparsec >= 0.10 && < 0.11,
base >= 4 && < 5,
- bytestring >= 0.9 && < 0.10,
+ bytestring >= 0.9 && < 0.11,
cereal >= 0.3 && < 0.4,
clientsession >= 0.7 && < 0.8,
comonad >= 3.0 && < 3.1,
@@ -152,7 +153,7 @@ Executable nesttest
data-lens >= 2.0.1 && < 2.11,
data-lens-template >= 2.1.1 && < 2.2,
directory,
- directory-tree >= 0.10 && < 0.11,
+ directory-tree >= 0.10 && < 0.12,
dlist >= 0.5 && < 0.6,
errors >= 1.3.1 && < 1.4,
filepath,

0 comments on commit f3c5e45

Please sign in to comment.
Something went wrong with that request. Please try again.