Skip to content

update to sqlite-simple 0.4.19.0 - #6

Closed
evgeny-simplex wants to merge 26 commits into
simplex-chat:sqlcipherfrom
evgeny-simplex:ep/sqlcipher-merge
Closed

evgeny-simplex wants to merge 26 commits into
simplex-chat:sqlcipherfrom
evgeny-simplex:ep/sqlcipher-merge

Conversation

@evgeny-simplex

Copy link
Copy Markdown

00292a3 merges master (nurpax/sqlite-simple 2b7b708, 0.4.19.0) into sqlcipher. Its conflict resolutions are inside the merge commit: git show --remerge-diff 00292a3.

  • kept: package name, homepage, direct-sqlcipher dependency, our stack.yaml (upstream's is a link to stack-9.10.yaml), the workflow adapted to sqlcipher-simple;
  • not taken: the revert of reading numbers into text fields (b8a1f83), which the fork has relied on since 2022; tests adjusted to it;
  • upstream's stack-9.x.yaml files set only a resolver and do not build this package.

9251ff1 pins direct-sqlcipher to 2330df3 in cabal.project and stack.yaml, as in CI and SimpleX.

Merge with a merge commit, so that master stays an ancestor of sqlcipher.

jchia and others added 26 commits January 13, 2024 15:25
…onfig-fix-warnings

Add github actions CI config, improve tests, fix few typos and hlint warnings
Since Ok can store any exception in makes no reason to erase type of exception
and convert it to ErrorCall

This also makes MonadThrow instance not conditional on existence of MonadFail
instances
This appeases the -Wnoncanonical-monad-instances warning. This warning
exists because a future GHC release may treat noncanonical definitions
as errors.

See also:
  https://gitlab.haskell.org/ghc/ghc/-/wikis/proposal/monad-of-no-return
Added queryNamedWith, foldWith, foldWith_, and foldNamedWith

---------

Co-authored-by: Tristan Mc Leay <tristan@cassowary.org>

Copy link
Copy Markdown
Author

Replaced by #7, which holds the merge commit alone; the pin moved to #5.

@evgeny-simplex
evgeny-simplex deleted the ep/sqlcipher-merge branch November 19, 2026 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants