Skip to content

Commit

Permalink
Version 2.8.0.436.
Browse files Browse the repository at this point in the history
  • Loading branch information
mdgabriel committed Nov 13, 2019
1 parent 1b3ab89 commit 3cfc593
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
dist
dist-newstyle
.stack-work
stack.yaml.lock
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@
## 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.
10 changes: 8 additions & 2 deletions scidb-hquery.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: scidb-hquery
version: 2.8.0.435
version: 2.8.0.436
license: GPL-3.0-only
license-file: LICENSE
copyright: All rights reserved 2014-19(c).
Expand All @@ -14,17 +14,19 @@ description:
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
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.435
tag: 2.8.0.436

custom-setup
setup-depends: base >=4.12.0.0 && <4.13,
Expand Down Expand Up @@ -77,6 +79,8 @@ library
mtl >=2.2.2 && <2.3,
network >=2.8.0.1 && <3.2,
process >=1.6.5.0 && <1.7,
-- 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,
Expand Down Expand Up @@ -131,6 +135,8 @@ executable hquery
mtl >=2.2.2 && <2.3,
network >=2.8.0.1 && <3.2,
process >=1.6.5.0 && <1.7,
-- 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,
Expand Down
6 changes: 3 additions & 3 deletions src/HQuery.hs
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ getSciDbVersion e = withSocketsDo (runReaderT (evalStateT fetchVersion defaultPa

-- | 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 =
Expand Down
2 changes: 1 addition & 1 deletion src/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ config =
Config {
argOrder = RequireOrder,
-- Update revision number: toggle case
release = "2.8.0.435",
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]"++
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#
# resolver: ./custom-snapshot.yaml
# resolver: https://example.com/snapshots/2018-01-01.yaml
resolver: lts-13.29
resolver: lts-14.14

# User packages to be built.
# Various formats can be used as shown in the example below.
Expand Down

0 comments on commit 3cfc593

Please sign in to comment.