pontarius-xmpp 0.5.6.2 → 0.5.6.3
raw patch · 4 files changed
+6/−108 lines, 4 filesdep −doctestdep ~basesetup-changedPVP ok
version bump matches the API change (PVP)
Dependencies removed: doctest
Dependency ranges changed: base
API changes (from Hackage documentation)
Files
- Setup.hs +2/−45
- pontarius-xmpp.cabal +3/−22
- source/Network/Xmpp/Sasl.hs +1/−1
- tests/Doctest.hs +0/−40
Setup.hs view
@@ -1,45 +1,2 @@--- pilfered from lens package-{-# OPTIONS_GHC -Wall #-}-module Main (main) where--import Distribution.Package ( PackageName, Package, PackageId, InstalledPackageId, packageVersion, packageName, unPackageName )-import Distribution.PackageDescription ( PackageDescription(), TestSuite(..) )-import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks )-import Distribution.Simple.Utils ( rewriteFile, createDirectoryIfMissingVerbose, copyFiles, ordNub )-import Distribution.Simple.BuildPaths ( autogenModulesDir )-import Distribution.Simple.Setup ( BuildFlags(buildVerbosity), Flag(..), fromFlag, HaddockFlags(haddockDistPref))-import Distribution.Simple.LocalBuildInfo ( withLibLBI, withTestLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps) )-import Distribution.Text ( display )-import Distribution.Types.MungedPackageId ( MungedPackageId(mungedName, mungedVersion) )-import Distribution.Types.MungedPackageName ( MungedPackageName, unMungedPackageName )-import Distribution.Types.UnqualComponentName ( unUnqualComponentName )-import Distribution.Verbosity ( Verbosity, normal )-import Distribution.Version ( showVersion )-import System.FilePath ( (</>) )--main :: IO ()-main = defaultMainWithHooks simpleUserHooks- { buildHook = \pkg lbi hooks flags -> do- generateBuildModule (fromFlag (buildVerbosity flags)) pkg lbi- buildHook simpleUserHooks pkg lbi hooks flags- }--generateBuildModule :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()-generateBuildModule verbosity pkg lbi = do- let dir = autogenModulesDir lbi- createDirectoryIfMissingVerbose verbosity True dir- withLibLBI pkg lbi $ \_ libcfg -> do- withTestLBI pkg lbi $ \suite suitecfg -> do- let testSuiteName = unUnqualComponentName (testName suite)- rewriteFile (dir </> "Build_" ++ testSuiteName ++ ".hs") $ unlines- [ "module Build_" ++ testSuiteName ++ " where"- , "deps :: [String]"- , "deps = " ++ (show $ formatdeps (testDeps libcfg suitecfg))- ]- where- formatdeps = map (formatone . snd)- formatone p =- unMungedPackageName (mungedName p) ++ "-" ++ showVersion (mungedVersion p)--testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [(InstalledPackageId, MungedPackageId)]-testDeps xs ys = ordNub $ componentPackageDeps xs ++ componentPackageDeps ys+import Distribution.Simple+main = defaultMain
pontarius-xmpp.cabal view
@@ -1,7 +1,7 @@ Name: pontarius-xmpp-Version: 0.5.6.2+Version: 0.5.6.3 Cabal-Version: >= 1.10-Build-Type: Custom+Build-Type: Simple License: BSD3 License-File: LICENSE.md Copyright: Dmitry Astapov, Pierre Kovalev, Mahdi Abdinejadi, Jon Kristensen,@@ -32,11 +32,6 @@ Default: True } -custom-setup- setup-depends: base- , Cabal >= 2.0.1.0- , filepath- Library hs-source-dirs: source Exposed: True@@ -166,20 +161,6 @@ ghc-options: -Wall -O2 -fno-warn-orphans default-language: Haskell2010 -Test-Suite doctest- Type: exitcode-stdio-1.0- hs-source-dirs: tests- main-is: Doctest.hs- GHC-Options: -Wall -threaded- Build-Depends: base- , doctest- , directory- , filepath- , QuickCheck- , derive- , quickcheck-instances- default-language: Haskell2010- Test-Suite runtests Type: exitcode-stdio-1.0 hs-source-dirs: tests@@ -226,4 +207,4 @@ Source-Repository this Type: git Location: https://github.com/l29ah/pontarius-xmpp.git- Tag: 0.5.6.2+ Tag: 0.5.6.3
source/Network/Xmpp/Sasl.hs view
@@ -98,7 +98,7 @@ -- "<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'/>" -- element, with a possible "<resource>[JID]</resource>" -- child.- xpBind . xpOption $ xpElemNodes "resource" (xpContent xpId)+ xpBind . xpOption $ xpElemNodes "{urn:ietf:params:xml:ns:xmpp-bind}resource" (xpContent xpId) -- Sends a (synchronous) IQ set request for a (`Just') given or server-generated -- resource and extract the JID from the non-error response.
− tests/Doctest.hs
@@ -1,40 +0,0 @@--- pilfered from lens package--module Main(main) where--import Build_doctest (deps)--import Control.Applicative-import Control.Monad-import Data.List-import System.Directory-import System.FilePath-import Test.DocTest--main :: IO ()-main = doctest $- "-isource"- : "-itests"- : "-w"- : "-idist/build/autogen"- : "-hide-all-packages"- : "-XQuasiQuotes"- : "-XOverloadedStrings"- : "-DWITH_TEMPLATE_HASKELL"- : map ("-package="++) deps- ++ sources--sources :: [String]-sources = ["Network.Xmpp.Types"] -- ["source/Network/Xmpp/Types.hs"]--getSources :: IO [FilePath]-getSources = filter (isSuffixOf ".hs") <$> go "source"- where- go dir = do- (dirs, files) <- getFilesAndDirectories dir- (files ++) . concat <$> mapM go dirs--getFilesAndDirectories :: FilePath -> IO ([FilePath], [FilePath])-getFilesAndDirectories dir = do- c <- map (dir </>) . filter (`notElem` ["..", "."]) <$> getDirectoryContents dir- (,) <$> filterM doesDirectoryExist c <*> filterM doesFileExist c