diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index a2b5e3b..d17436d 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -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 # @@ -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: @@ -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 <> 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 @@ -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: | diff --git a/cabal.project b/cabal.project new file mode 100644 index 0000000..dcdf91d --- /dev/null +++ b/cabal.project @@ -0,0 +1,7 @@ +packages: . +-- packages: . ../direct-sqlcipher + +source-repository-package + type: git + location: https://github.com/simplex-chat/direct-sqlcipher.git + tag: 34309410eb2069b029b8fc1872deb1e0db123294 diff --git a/sqlite-simple.cabal b/sqlcipher-simple.cabal similarity index 82% rename from sqlite-simple.cabal rename to sqlcipher-simple.cabal index e581d59..2a4641e 100644 --- a/sqlite-simple.cabal +++ b/sqlcipher-simple.cabal @@ -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): . - You can view the project page at + You can view the project page at for more information. License: BSD3 License-file: LICENSE Author: Bryan O'Sullivan, Leon P Smith, Janne Hellsten -Maintainer: Janne Hellsten +Maintainer: Evgeny Poberezkin 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 @@ -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, @@ -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 @@ -109,7 +109,7 @@ test-suite test , base16-bytestring , bytestring >= 0.9 , HUnit - , sqlite-simple - , direct-sqlite + , sqlcipher-simple + , direct-sqlcipher , text , time diff --git a/stack.yaml b/stack.yaml deleted file mode 120000 index 3610612..0000000 --- a/stack.yaml +++ /dev/null @@ -1 +0,0 @@ -stack-9.10.yaml \ No newline at end of file diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 0000000..a482ea3 --- /dev/null +++ b/stack.yaml @@ -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