more FlexibleContexts
This commit is contained in:
parent
082b1590ce
commit
26ac0753c1
5 changed files with 15 additions and 3 deletions
|
@ -6,6 +6,7 @@
|
||||||
-}
|
-}
|
||||||
|
|
||||||
{-# LANGUAGE CPP, QuasiQuotes, TemplateHaskell, OverloadedStrings #-}
|
{-# LANGUAGE CPP, QuasiQuotes, TemplateHaskell, OverloadedStrings #-}
|
||||||
|
{-# LANGUAGE FlexibleContexts #-}
|
||||||
|
|
||||||
module Assistant.WebApp.Configurators.Edit where
|
module Assistant.WebApp.Configurators.Edit where
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
- Licensed under the GNU AGPL version 3 or higher.
|
- Licensed under the GNU AGPL version 3 or higher.
|
||||||
-}
|
-}
|
||||||
|
|
||||||
{-# LANGUAGE CPP, QuasiQuotes, TemplateHaskell, OverloadedStrings, RankNTypes, KindSignatures, TypeFamilies #-}
|
{-# LANGUAGE CPP, QuasiQuotes, TemplateHaskell, OverloadedStrings, #-}
|
||||||
|
{-# LANGUAGE RankNTypes, KindSignatures, TypeFamilies, FlexibleContexts #-}
|
||||||
|
|
||||||
module Assistant.WebApp.Configurators.Local where
|
module Assistant.WebApp.Configurators.Local where
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
-}
|
-}
|
||||||
|
|
||||||
{-# LANGUAGE QuasiQuotes, TemplateHaskell, OverloadedStrings #-}
|
{-# LANGUAGE QuasiQuotes, TemplateHaskell, OverloadedStrings #-}
|
||||||
{-# LANGUAGE CPP #-}
|
{-# LANGUAGE CPP, FlexibleContexts #-}
|
||||||
|
|
||||||
module Assistant.WebApp.Configurators.Ssh where
|
module Assistant.WebApp.Configurators.Ssh where
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ sshInputAForm hostnamefield d = normalize <$> gen
|
||||||
, ("existing ssh key", ExistingSshKey)
|
, ("existing ssh key", ExistingSshKey)
|
||||||
]
|
]
|
||||||
|
|
||||||
check_username = checkBool (all (`notElem` "/:@ \t") . T.unpack)
|
check_username = checkBool (all (`notElem` ("/:@ \t" :: String)) . T.unpack)
|
||||||
bad_username textField
|
bad_username textField
|
||||||
|
|
||||||
bad_username = "bad user name" :: Text
|
bad_username = "bad user name" :: Text
|
||||||
|
|
|
@ -176,7 +176,11 @@ parseRaw l = go $ words l
|
||||||
|
|
||||||
parseTimeStamp :: String -> POSIXTime
|
parseTimeStamp :: String -> POSIXTime
|
||||||
parseTimeStamp = utcTimeToPOSIXSeconds . fromMaybe (error "bad timestamp") .
|
parseTimeStamp = utcTimeToPOSIXSeconds . fromMaybe (error "bad timestamp") .
|
||||||
|
#if MIN_VERSION_time(1,5,0)
|
||||||
|
parseTimeM True defaultTimeLocale "%s"
|
||||||
|
#else
|
||||||
parseTime defaultTimeLocale "%s"
|
parseTime defaultTimeLocale "%s"
|
||||||
|
#endif
|
||||||
|
|
||||||
showTimeStamp :: TimeZone -> POSIXTime -> String
|
showTimeStamp :: TimeZone -> POSIXTime -> String
|
||||||
showTimeStamp zone = show . utcToLocalTime zone . posixSecondsToUTCTime
|
showTimeStamp zone = show . utcToLocalTime zone . posixSecondsToUTCTime
|
||||||
|
|
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -1,3 +1,9 @@
|
||||||
|
git-annex (5.20150509) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
|
* Now builds cleanly using ghc 7.10 (as well as ghc back to 7.6).
|
||||||
|
|
||||||
|
-- Joey Hess <id@joeyh.name> Sun, 10 May 2015 15:45:48 -0400
|
||||||
|
|
||||||
git-annex (5.20150508) unstable; urgency=medium
|
git-annex (5.20150508) unstable; urgency=medium
|
||||||
|
|
||||||
* Improve behavior when a git-annex command is told to operate
|
* Improve behavior when a git-annex command is told to operate
|
||||||
|
|
Loading…
Reference in a new issue