diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,3 +19,11 @@ ## 2.8.0.434 -- 2019-07-12 * Improved README.md and description documentation. + +## 2.8.0.435 -- 2019-07-27 + +* Now works with stack. + +## 2.8.0.436 -- 2019-11-13 + +* Added a base-compat constraint so that regex always compiles and added tested-with to the cabal file. Changed the stack resolver to lts-14.14. Small improvement in the documentation. diff --git a/scidb-hquery.cabal b/scidb-hquery.cabal --- a/scidb-hquery.cabal +++ b/scidb-hquery.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: scidb-hquery -version: 2.8.0.434 +version: 2.8.0.436 license: GPL-3.0-only license-file: LICENSE copyright: All rights reserved 2014-19(c). @@ -10,24 +10,23 @@ bug-reports: https://github.com/mdgabriel/scidb-hquery/issues synopsis: Haskell query for SciDB via shim description: - The command hquery with no operands and no options will begin an - interacitve session with a SciDB server using SciDB's shim - protocol at host localhost and port 8080. See the [homepage](https://github.com/mdgabriel/scidb-hquery.git), - "hquery -m", and [www.paradigm4.com](http://www.paradigm4.com) for more infomation. + The command hquery with no operands and no options will begin an + interacitve session with a SciDB server using SciDB's shim + protocol at host localhost and port 8080. See the [homepage](https://github.com/mdgabriel/scidb-hquery.git), + "hquery -m", and [www.paradigm4.com](http://www.paradigm4.com) for more infomation. + Note that scidb-hquery builds with cabal v2-build and stack resolver lts-14.14. category: program, client, database, library build-type: Custom --- The entry src/SciDbAFL.cf in extra-source-files below is a --- workaround for issue https://github.com/haskell/cabal/issues/6124 --- so that cabal new-sdist works. extra-source-files: CHANGELOG.md README.md src/SciDbAFL.cf +tested-with: GHC==8.6.5 source-repository head type: git location: https://github.com/mdgabriel/scidb-hquery.git - tag: 2.8.0.434 + tag: 2.8.0.436 custom-setup setup-depends: base >=4.12.0.0 && <4.13, @@ -45,7 +44,7 @@ Utils UtilsUnsafe build-tool-depends: BNFC:bnfc >=2.8.2, alex:alex >=3.2.4, - happy:happy >=1.19.9 + happy:happy >=1.19.11 hs-source-dirs: src other-modules: AbsSciDbAFL @@ -66,26 +65,28 @@ HTTP >=4000.3.14 && <4000.4, array >=0.5.3.0 && <0.6, bytestring >=0.10.8.2 && <0.11, - connection >=0.3.0 && <0.4, - cryptonite ==0.26.*, + connection >=0.2.8 && <0.4, + cryptonite >=0.25 && <0.27, data-default-class >=0.1.2.0 && <0.2, exceptions >=0.10.2 && <0.11, - haskeline >=0.7.4.3 && <0.8, + haskeline >=0.7.5.0 && <0.8, hostname-validate >=1.0.0 && <1.1, - http-client >=0.6.4 && <0.7, + http-client >=0.5.14 && <0.7, http-client-tls >=0.3.5.3 && <0.4, http-conduit >=2.3.7.1 && <2.4, http-types >=0.12.3 && <0.13, memory >=0.14.18 && <0.15, mtl >=2.2.2 && <2.3, - network >=3.1.0.1 && <3.2, + network >=2.8.0.1 && <3.2, process >=1.6.5.0 && <1.7, - regex >=1.0.0.0 && <1.1, + -- base-compat constraint needed so that regex continues to compile + base-compat >=0.6 && <0.11, + regex >=1.0.2.0 && <1.1, safe >=0.3.17 && <0.4, split >=0.2.3.3 && <0.3, terminal-size >=0.3.2.1 && <0.4, text >=1.2.3.1 && <1.3, - tls >=1.5.0 && <1.6, + tls >=1.4.1 && <1.6, x509-store >=1.6.7 && <1.7 executable hquery @@ -118,26 +119,28 @@ HTTP >=4000.3.14 && <4000.4, array >=0.5.3.0 && <0.6, bytestring >=0.10.8.2 && <0.11, - connection >=0.3.0 && <0.4, - cryptonite ==0.26.*, + connection >=0.2.8 && <0.4, + cryptonite >=0.25 && <0.27, data-default-class >=0.1.2.0 && <0.2, directory >=1.3.3.0 && <1.4, exceptions >=0.10.2 && <0.11, filepath >=1.4.2.1 && <1.5, - haskeline >=0.7.4.3 && <0.8, + haskeline >=0.7.5.0 && <0.8, hostname-validate >=1.0.0 && <1.1, - http-client >=0.6.4 && <0.7, + http-client >=0.5.14 && <0.7, http-client-tls >=0.3.5.3 && <0.4, http-conduit >=2.3.7.1 && <2.4, http-types >=0.12.3 && <0.13, memory >=0.14.18 && <0.15, mtl >=2.2.2 && <2.3, - network >=3.1.0.1 && <3.2, + network >=2.8.0.1 && <3.2, process >=1.6.5.0 && <1.7, - regex >=1.0.0.0 && <1.1, + -- base-compat constraint needed so that regex continues to compile + base-compat >=0.6 && <0.11, + regex >=1.0.2.0 && <1.1, safe >=0.3.17 && <0.4, split >=0.2.3.3 && <0.3, terminal-size >=0.3.2.1 && <0.4, text >=1.2.3.1 && <1.3, - tls >=1.5.0 && <1.6, + tls >=1.4.1 && <1.6, x509-store >=1.6.7 && <1.7 diff --git a/src/HQuery.hs b/src/HQuery.hs --- a/src/HQuery.hs +++ b/src/HQuery.hs @@ -142,13 +142,13 @@ -- | Given an 'Environment', make and set the global network manager, -- check for digest authorization and the SciDB version, and update --- the 'Environment'. Either return 'Just Environment' or 'Nothing' +-- the 'Environment'. Either return 'Just' 'Environment' or 'Nothing' -- in the IO monad in the case of an invalid certificate store when -- the protocol is HTTPS and insecure validation is not used. Be -- careful: no resolving or verification of the 'Environment' is --- performed. When 'mkGlobalManagerEnv' returns 'Just Environment', +-- performed. When 'mkGlobalManagerEnv' returns 'Just' 'Environment', -- this is the initialized 'Environment' to be used with the actions --- 'runQueries' and 'unsafeRunQuery'. +-- 'runQueries' and 'unsafeRunQuery' and the function 'getSciDbVersion'. mkGlobalManagerEnv :: Environment -> IO (Maybe Environment) mkGlobalManagerEnv env = diff --git a/src/Main.hs b/src/Main.hs --- a/src/Main.hs +++ b/src/Main.hs @@ -454,8 +454,8 @@ config = Config { argOrder = RequireOrder, - -- Update revision number: TOGGLE CASE - release = "2.8.0.434", + -- Update revision number: toggle case + release = "2.8.0.436", flagsOps = " [[-g|-h|-l|-m|-v|-y] |"++ "\n [-V n] [-t hstfile] [-c certstore] [-n]"++ "\n [-r http[s]] [-i host] [-p port] [-a true|false]"++