diff --git a/scion-browser.cabal b/scion-browser.cabal --- a/scion-browser.cabal +++ b/scion-browser.cabal @@ -1,5 +1,5 @@ name: scion-browser -version: 0.1.3.3 +version: 0.1.3.4 cabal-version: >= 1.8 build-type: Simple license: BSD3 @@ -55,6 +55,7 @@ containers >= 0.2 && < 0.4, directory == 1.0.*, filepath == 1.1.*, + bytestring, -- For Scion.Packages (provisional) ghc >= 6.10 && < 6.13 @@ -110,6 +111,7 @@ containers >= 0.2 && < 0.4, directory == 1.0.*, filepath == 1.1.*, + bytestring, -- For Scion.Packages (provisional) ghc >= 6.10 && < 6.13 diff --git a/scion-browser.cabal~ b/scion-browser.cabal~ new file mode 100644 --- /dev/null +++ b/scion-browser.cabal~ @@ -0,0 +1,177 @@ +name: scion-browser +version: 0.1.3.4 +cabal-version: >= 1.8 +build-type: Simple +license: BSD3 +license-file: docs/LICENSE +author: Alejandro Serrano +maintainer: Alejandro Serrano +homepage: http://github.com/serras/scion-class-browser +category: Development +synopsis: Command-line interface for browsing and searching packages documentation +description: Scion Browser aims to be a command-line interface for getting information about installed Haskell packages, that could be later used by development environments. It also provides integration with Hoogle. By now, it has been integrated in EclipseFP. + +source-repository head + type: git + location: https://github.com/serras/scion-class-browser + +library + hs-source-dirs: src + build-depends: + attoparsec >= 0.10, + base == 4.*, + mtl >= 2, + derive >= 2.5 && < 3, + text == 0.11.*, + parsec >= 3 && < 4, + cereal == 0.3.*, + Cabal >= 0.10, + haskell-src-exts >= 1.11 && < 2, + process >= 1 && < 2, + tar == 0.3.*, + zlib == 0.5.*, + HTTP >= 4000 && < 5000, + deepseq >= 1.1 && < 2, + aeson-native >= 0.3.3.1, + parallel-io >= 0.3, + utf8-string , + -- For Scion.packages (provisional) + ghc-paths == 0.1.* + + if !os(mingw32) + build-depends: + unix >= 2 && < 3 + + if impl(ghc >= 7.0) + build-depends: + containers >= 0.2 && < 0.5, + directory == 1.1.*, + filepath == 1.2.*, + bytestring, + -- For Scion.Packages (provisional) + ghc >= 7 + else + build-depends: + containers >= 0.2 && < 0.4, + directory == 1.0.*, + filepath == 1.1.*, + bytestring, + -- For Scion.Packages (provisional) + ghc >= 6.10 && < 6.13 + + exposed-modules: + Scion.Browser, + Scion.Browser.Query, + Scion.Browser.Build, + Scion.Hoogle + + ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind -fno-warn-orphans + other-modules: Scion.Browser.Instances.Json, Scion.Browser.Instances.NFData, Scion.Browser.Instances.Serialize, Scion.Browser.Parser.Documentable, Scion.Browser.Parser.Internal, Scion.Browser.FileUtil, Scion.Browser.Parser, Scion.Browser.TempFile, Scion.Browser.Types, Scion.Browser.Util, Scion.Hoogle.Instances.Json, Scion.Hoogle.Parser, Scion.Hoogle.Types, Scion.Hoogle.Util, Scion.Packages, Scion.Browser.FromMissingH + +executable scion-browser + hs-source-dirs: src + main-is: Main.hs + build-depends: + haskeline >= 0.6, + -- From library + attoparsec >= 0.10, + base == 4.*, + mtl >= 2, + derive >= 2.5 && < 3, + text == 0.11.*, + parsec >= 3 && < 4, + cereal == 0.3.*, + Cabal >= 0.10, + haskell-src-exts >= 1.11 && < 2, + process >= 1 && < 2, + tar == 0.3.*, + zlib == 0.5.*, + HTTP >= 4000 && < 5000, + deepseq >= 1.1 && < 2, + aeson-native >= 0.3.3.1, + parallel-io >= 0.3, + utf8-string , + -- For Scion.packages (provisional) + ghc-paths == 0.1.* + + if !os(mingw32) + build-depends: + unix >= 2 && < 3 + + if impl(ghc >= 7.0) + build-depends: + containers >= 0.2 && < 0.5, + directory == 1.1.*, + filepath == 1.2.*, + bytestring, + -- For Scion.Packages (provisional) + ghc >= 7 + else + build-depends: + containers >= 0.2 && < 0.4, + directory == 1.0.*, + filepath == 1.1.*, + bytestring, + -- For Scion.Packages (provisional) + ghc >= 6.10 && < 6.13 + + ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind -fno-warn-orphans -threaded + other-modules: Server.Commands, Scion.Browser.Instances.Json, Scion.Browser.Instances.NFData, Scion.Browser.Instances.Serialize, Scion.Browser.Parser.Documentable, Scion.Browser.Parser.Internal, Scion.Browser.Build, Scion.Browser.FileUtil, Scion.Browser.Parser, Scion.Browser.Query, Scion.Browser.TempFile, Scion.Browser.Types, Scion.Browser.Util, Scion.Hoogle.Instances.Json, Scion.Hoogle.Parser, Scion.Hoogle.Types, Scion.Hoogle.Util, Scion.Browser, Scion.Hoogle, Scion.Packages, Scion.Browser.FromMissingH + +test-suite BrowserTests + main-is: Test.hs + type: exitcode-stdio-1.0 + x-uses-tf: true + ghc-options: -Wall -rtsopts + hs-source-dirs: src, test + other-modules: Scion.Browser.Parser.Documentable, Scion.Browser.Parser.Internal, Scion.Browser.Parser, Scion.Browser.ParserTests + + build-depends: + HUnit >= 1.2 && < 2, + QuickCheck >= 2.4, + test-framework >= 0.4.1, + test-framework-quickcheck2, + test-framework-hunit, + split, + haskeline >= 0.6, + -- From library + attoparsec >= 0.10, + base == 4.*, + mtl >= 2, + derive >= 2.5 && < 3, + text == 0.11.*, + parsec >= 3 && < 4, + cereal == 0.3.*, + Cabal >= 0.10, + haskell-src-exts >= 1.11 && < 2, + process >= 1 && < 2, + tar == 0.3.*, + zlib == 0.5.*, + HTTP >= 4000 && < 5000, + deepseq >= 1.1 && < 2, + aeson-native >= 0.3.3.1, + parallel-io >= 0.3, + utf8-string , + -- For Scion.packages (provisional) + ghc-paths == 0.1.* + + if !os(mingw32) + build-depends: + unix >= 2 && < 3 + + if impl(ghc >= 7.0) + build-depends: + containers >= 0.2 && < 0.5, + directory == 1.1.*, + filepath == 1.2.*, + bytestring, + -- For Scion.Packages (provisional) + ghc >= 7 + else + build-depends: + containers >= 0.2 && < 0.4, + directory == 1.0.*, + filepath == 1.1.*, + bytestring, + -- For Scion.Packages (provisional) + ghc >= 6.10 && < 6.13 diff --git a/src/Scion/Browser/Util.hs b/src/Scion/Browser/Util.hs --- a/src/Scion/Browser/Util.hs +++ b/src/Scion/Browser/Util.hs @@ -9,7 +9,7 @@ import System.IO (hFlush, stdout) import System.Process import Text.Parsec.Error (ParseError) -import GHC.Conc.Sync (numCapabilities) +import GHC.Conc (numCapabilities) withThreaded :: (Pool -> IO a) -> IO a withThreaded = withPool numCapabilities