Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This GitHub workflow config has been generated by a script via
#
# haskell-ci '--distribution' 'noble' 'github' 'sqlite-simple.cabal'
# haskell-ci '--distribution' 'noble' 'github' 'sqlcipher-simple.cabal'
#
# To regenerate the script (for example after adjusting tested-with) run
#
Expand All @@ -10,7 +10,7 @@
#
# version: 0.19.20250506
#
# REGENDATA ("0.19.20250506",["--distribution","noble","github","sqlite-simple.cabal"])
# REGENDATA ("0.19.20250506",["--distribution","noble","github","sqlcipher-simple.cabal"])
#
name: Haskell-CI
on:
Expand Down Expand Up @@ -171,17 +171,21 @@ jobs:
find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
- name: generate cabal.project
run: |
PKGDIR_sqlite_simple="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/sqlite-simple-[0-9.]*')"
echo "PKGDIR_sqlite_simple=${PKGDIR_sqlite_simple}" >> "$GITHUB_ENV"
PKGDIR_sqlcipher_simple="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/sqlcipher-simple-[0-9.]*')"
echo "PKGDIR_sqlcipher_simple=${PKGDIR_sqlcipher_simple}" >> "$GITHUB_ENV"
rm -f cabal.project cabal.project.local
touch cabal.project
touch cabal.project.local
echo "packages: ${PKGDIR_sqlite_simple}" >> cabal.project
echo "package sqlite-simple" >> cabal.project
echo "packages: ${PKGDIR_sqlcipher_simple}" >> cabal.project
echo "package sqlcipher-simple" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF
source-repository-package
type: git
location: https://github.com/simplex-chat/direct-sqlcipher.git
tag: 2330df3dc8c4b660674d3c02d76bb86f66c2abee
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(sqlite-simple)$/; }' >> cabal.project.local
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(sqlcipher-simple)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
- name: dump install plan
Expand Down Expand Up @@ -209,7 +213,7 @@ jobs:
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
- name: cabal check
run: |
cd ${PKGDIR_sqlite_simple} || false
cd ${PKGDIR_sqlcipher_simple} || false
${CABAL} -vnormal check
- name: haddock
run: |
Expand Down
7 changes: 7 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
packages: .
-- packages: . ../direct-sqlcipher

source-repository-package
type: git
location: https://github.com/simplex-chat/direct-sqlcipher.git
tag: 34309410eb2069b029b8fc1872deb1e0db123294
20 changes: 10 additions & 10 deletions sqlite-simple.cabal → sqlcipher-simple.cabal
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
Name: sqlite-simple
Name: sqlcipher-simple
Version: 0.4.19.0
Synopsis: Mid-Level SQLite client library
Description:
Mid-level SQLite client library, based on postgresql-simple.
Mid-level SQLCipher client library, forked from sqlite-simple.
.
Main documentation (with examples): <docs/Database-SQLite-Simple.html Database.SQLite.Simple>
.
You can view the project page at <http://github.com/nurpax/sqlite-simple>
You can view the project page at <https://github.com/simplex-chat/sqlcipher-simple>
for more information.

License: BSD3
License-file: LICENSE
Author: Bryan O'Sullivan, Leon P Smith, Janne Hellsten
Maintainer: Janne Hellsten <jjhellst@gmail.com>
Maintainer: Evgeny Poberezkin <ep@simplex.chat>
Copyright: (c) 2011 MailRank, Inc.,
(c) 2011-2012 Leon P Smith,
(c) 2012-2014 Janne Hellsten
(c) 2022-2026 Joshua Chia
Homepage: http://github.com/nurpax/sqlite-simple
bug-reports: http://github.com/nurpax/sqlite-simple/issues
Homepage: https://github.com/simplex-chat/sqlcipher-simple
bug-reports: https://github.com/simplex-chat/sqlcipher-simple/issues
Stability: stable
Category: Database
Build-type: Simple
Expand Down Expand Up @@ -51,7 +51,7 @@ Library
blaze-textual,
bytestring >= 0.9,
containers,
direct-sqlite >= 2.3.13 && < 2.4,
direct-sqlcipher >= 2.3.13 && < 2.4,
exceptions >= 0.4,
template-haskell,
text >= 0.11,
Expand All @@ -73,7 +73,7 @@ Library

source-repository head
type: git
location: http://github.com/nurpax/sqlite-simple
location: http://github.com/simplex-chat/sqlcipher-simple


test-suite test
Expand Down Expand Up @@ -109,7 +109,7 @@ test-suite test
, base16-bytestring
, bytestring >= 0.9
, HUnit
, sqlite-simple
, direct-sqlite
, sqlcipher-simple
, direct-sqlcipher
, text
, time
1 change: 0 additions & 1 deletion stack.yaml

This file was deleted.

12 changes: 12 additions & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
resolver: lts-15.1 # 8.8.2 - base-4.13
# resolver: lts-14.27 # 8.6.5 - base-4.12
# resolver: lts-12.26 # 8.4.4 - base-4.11
# resolver: lts-11.22 # 8.2.2 - base-4.10
# resolver: lts-9.21 # 8.0.2 - base-4.9
# resolver: lts-6.35 # 7.10.3 - base-4.8

extra-deps:
# - direct-sqlcipher-2.3.26
# - ../direct-sqlcipher
- github: simplex-chat/direct-sqlcipher
commit: 34309410eb2069b029b8fc1872deb1e0db123294
Loading