dixi 0.6.0.3 → 0.6.0.4

raw patch · 2 files changed

+12/−13 lines, 2 filesdep ~basedep ~base-orphansdep ~transformers-compat

Dependency ranges changed: base, base-orphans, transformers-compat

Files

• Dixi/Database/Orphans.hs +1/−5
• dixi.cabal +11/−8

@@ -18,8 +18,8 @@ #ifdef OLDBASE import Data.Foldable import Data.Traversable-import Data.Orphans() #endif+import Data.Orphans()  deriveSafeCopy 0 'base ''Node deriveSafeCopy 0 'base ''C.Compositions@@ -30,11 +30,7 @@ deriveSafeCopy 0 'base ''Last deriveSafeCopy 0 'base ''HunkStatus -deriving instance Foldable    (Last)-deriving instance Traversable (Last)- deriving instance Typeable (Patch) deriving instance Typeable (HunkStatus) -deriving instance Data a => (Data (Last a)) 

@@ -2,7 +2,7 @@ -- see http://haskell.org/cabal/users-guide/  name:                dixi-version:             0.6.0.3+version:             0.6.0.4 synopsis:            A wiki implemented with a firm theoretical foundation. description:         This project is a simple wiki developed based on a                      firm theoretical foundation.@@ -53,13 +53,14 @@                      , Dixi.Server   ghc-options:       -Wall   if flag(old-base)-     build-depends: base >= 4.7 && < 4.8, base-orphans >= 0.4 && < 0.5-                  , transformers-compat >= 0.4 && < 0.5+     build-depends: base >= 4.7 && < 4.8+                  , transformers-compat >= 0.4 && < 0.6      cpp-options: -DOLDBASE   else-     build-depends: base >= 4.8 && < 4.9+     build-depends: base >= 4.8 && < 4.10   build-depends:       composition-tree >= 0.2.0.1 && < 0.3, patches-vector >= 0.1.2 && < 0.2                      , pandoc >= 1.15 &&  < 1.17 , pandoc-types >= 1.12 && < 1.17+                     , base-orphans >= 0.5.0 && < 0.6                      , servant >= 0.4 && < 0.5                      , servant-server >= 0.4 && < 0.5                      , acid-state >= 0.12 && <0.15 , safecopy >= 0.8.3 && < 0.10@@ -91,14 +92,15 @@   build-depends: dixi    if flag(old-base)-     build-depends: base >= 4.7 && < 4.8, base-orphans >= 0.4 && < 0.5+     build-depends: base >= 4.7 && < 4.8      cpp-options: -DOLDBASE   else-     build-depends: base >= 4.8 && < 4.9+     build-depends: base >= 4.8 && < 4.10   build-depends: warp >= 3.0 && <3.3                , servant-server >= 0.4 && < 0.5                , directory >= 1.0 && < 1.3                , yaml >= 0.8 && < 0.9+               , base-orphans >= 0.5.0 && < 0.6                , acid-state >= 0.12 && <0.15                , text >= 1.2 && < 1.3                , filepath >= 1.3 && < 1.5@@ -111,10 +113,10 @@   type: exitcode-stdio-1.0   main-is: Docs.hs    if flag(old-base)-     build-depends: base >= 4.7 && < 4.8, base-orphans >= 0.4 && < 0.5+     build-depends: base >= 4.7 && < 4.8      cpp-options: -DOLDBASE   else-     build-depends: base >= 4.8 && < 4.9+     build-depends: base >= 4.8 && < 4.10   build-depends: dixi, servant-docs >= 0.4 && < 0.5                , text >= 1.2 && < 1.3                , servant >= 0.4 && < 0.5@@ -123,6 +125,7 @@                , aeson-pretty >= 0.7 && < 0.8                , aeson >= 0.8 && <  0.11                , attoparsec >= 0.12 && < 0.14+               , base-orphans >= 0.5.0 && < 0.6                , bytestring >= 0.10 && < 0.11                , shakespeare >= 2.0 && < 2.1                , vector >= 0.10 && <0.12