yesod-bin 1.2.6 → 1.2.6.1

raw patch · 8 files changed

+35/−8 lines, 8 filesdep +data-default-classdep −data-default

Dependencies added: data-default-class

Dependencies removed: data-default

Files

• Devel.hs +1/−1
• GhcBuild.hs +12/−0
• hsfiles/mongo.hsfiles +4/−1
• hsfiles/mysql.hsfiles +4/−1
• hsfiles/postgres-fay.hsfiles +4/−1
• hsfiles/postgres.hsfiles +4/−1
• hsfiles/sqlite.hsfiles +4/−1
• yesod-bin.cabal +2/−2

@@ -69,7 +69,7 @@ import           Network                               (withSocketsDo) #if MIN_VERSION_http_conduit(2, 0, 0) import           Network.HTTP.Conduit                  (conduitManagerSettings, newManager)-import           Data.Default                          (def)+import           Data.Default.Class                    (def) #else import           Network.HTTP.Conduit                  (def, newManager) #endif

@@ -42,7 +42,11 @@ import           Panic              (throwGhcException, panic) import           SrcLoc             (Located, mkGeneralLocated) import qualified StaticFlags+#if __GLASGOW_HASKELL__ >= 707+import           DynFlags           (ldInputs)+#else import           StaticFlags        (v_Ld_inputs)+#endif import           System.FilePath    (normalise, (</>)) import           Util               (consIORef, looksLikeModuleName) @@ -162,7 +166,15 @@     o_files <- mapM (\x -> compileFile hsc_env StopLn x) #endif                  non_hs_srcs+#if __GLASGOW_HASKELL__ >= 707+    let dflags4 = dflags3+            { ldInputs = map (DF.FileOption "") (reverse o_files)+                      ++ ldInputs dflags3+            }+    GHC.setSessionDynFlags dflags4+#else     liftIO $ mapM_ (consIORef v_Ld_inputs) (reverse o_files)+#endif     targets <- mapM (uncurry GHC.guessTarget) hs_srcs     GHC.setTargets targets     ok_flag <- GHC.load GHC.LoadAllTargets

@@ -238,7 +238,10 @@         case x of             Just (Entity uid _) -> return $ Just uid             Nothing -> do-                fmap Just $ insert $ User (credsIdent creds) Nothing+                fmap Just $ insert User+                    { userIdent = credsIdent creds+                    , userPassword = Nothing+                    }      -- You can add other plugins like BrowserID, email or OAuth here     authPlugins _ = [authBrowserId def, authGoogleEmail]

@@ -247,7 +247,10 @@         case x of             Just (Entity uid _) -> return $ Just uid             Nothing -> do-                fmap Just $ insert $ User (credsIdent creds) Nothing+                fmap Just $ insert User+                    { userIdent = credsIdent creds+                    , userPassword = Nothing+                    }      -- You can add other plugins like BrowserID, email or OAuth here     authPlugins _ = [authBrowserId def, authGoogleEmail]

@@ -260,7 +260,10 @@         case x of             Just (Entity uid _) -> return $ Just uid             Nothing -> do-                fmap Just $ insert $ User (credsIdent creds) Nothing+                fmap Just $ insert User+                    { userIdent = credsIdent creds+                    , userPassword = Nothing+                    }      -- You can add other plugins like BrowserID, email or OAuth here     authPlugins _ = [authBrowserId def, authGoogleEmail]

@@ -247,7 +247,10 @@         case x of             Just (Entity uid _) -> return $ Just uid             Nothing -> do-                fmap Just $ insert $ User (credsIdent creds) Nothing+                fmap Just $ insert User+                    { userIdent = credsIdent creds+                    , userPassword = Nothing+                    }      -- You can add other plugins like BrowserID, email or OAuth here     authPlugins _ = [authBrowserId def, authGoogleEmail]

@@ -247,7 +247,10 @@         case x of             Just (Entity uid _) -> return $ Just uid             Nothing -> do-                fmap Just $ insert $ User (credsIdent creds) Nothing+                fmap Just $ insert User+                    { userIdent = credsIdent creds+                    , userPassword = Nothing+                    }      -- You can add other plugins like BrowserID, email or OAuth here     authPlugins _ = [authBrowserId def, authGoogleEmail]

@@ -1,5 +1,5 @@ name:            yesod-bin-version:         1.2.6+version:         1.2.6.1 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -89,7 +89,7 @@                      , transformers                      , warp               >= 1.3.7.5                      , wai                >= 1.4-                     , data-default+                     , data-default-class      ghc-options:       -Wall -threaded     main-is:           main.hs