diff --git a/ghc-persistent-sqlite.changes b/ghc-persistent-sqlite.changes index 2020e0d..b2e7bb0 100644 --- a/ghc-persistent-sqlite.changes +++ b/ghc-persistent-sqlite.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat May 8 10:03:32 UTC 2021 - psimons@suse.com + +- Update persistent-sqlite to version 2.13.0.0 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Fri May 7 09:29:33 UTC 2021 - psimons@suse.com + +- Update persistent-sqlite to version 2.13.0.0. + ## 2.13.0.0 + + * [#1225](https://github.com/yesodweb/persistent/pull/1225) + * Support `persistent-2.13` changes for SqlBackend being made internal. + ------------------------------------------------------------------- Wed Mar 31 14:28:25 UTC 2021 - psimons@suse.com diff --git a/ghc-persistent-sqlite.spec b/ghc-persistent-sqlite.spec index a8002c5..16d2e7b 100644 --- a/ghc-persistent-sqlite.spec +++ b/ghc-persistent-sqlite.spec @@ -19,12 +19,13 @@ %global pkg_name persistent-sqlite %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.12.0.0 +Version: 2.13.0.0 Release: 0 Summary: Backend for the persistent library using sqlite3 License: MIT URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-bytestring-devel @@ -77,6 +78,7 @@ files. %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %define cabal_configure_options -fsystemlib diff --git a/persistent-sqlite-2.12.0.0.tar.gz b/persistent-sqlite-2.12.0.0.tar.gz deleted file mode 100644 index c9e1301..0000000 --- a/persistent-sqlite-2.12.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:150510f032f6c1ef18fcf6b5dae76e4bf2eef0c3538a72e2d919b7f0f2179063 -size 2276001 diff --git a/persistent-sqlite-2.13.0.0.tar.gz b/persistent-sqlite-2.13.0.0.tar.gz new file mode 100644 index 0000000..e8a0bee --- /dev/null +++ b/persistent-sqlite-2.13.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c78eb981e33da00a1a5a35237b88419ba30a92b16d08a792a5ac26d99106ef5 +size 2276299 diff --git a/persistent-sqlite.cabal b/persistent-sqlite.cabal new file mode 100644 index 0000000..7a881a0 --- /dev/null +++ b/persistent-sqlite.cabal @@ -0,0 +1,147 @@ +name: persistent-sqlite +version: 2.13.0.0 +x-revision: 1 +license: MIT +license-file: LICENSE +author: Michael Snoyman +maintainer: Michael Snoyman +synopsis: Backend for the persistent library using sqlite3. +description: This package includes a thin sqlite3 wrapper based on the direct-sqlite package, as well as the entire C library, so there are no system dependencies. +category: Database, Yesod +stability: Stable +cabal-version: >= 1.10 +build-type: Simple +homepage: http://www.yesodweb.com/book/persistent +bug-reports: https://github.com/yesodweb/persistent/issues +extra-source-files: ChangeLog.md cbits/*.c cbits/*.h + +flag systemlib + description: Use the system-wide sqlite library + default: False +flag use-pkgconfig + description: Use pkg-config to find system sqlite library + default: False +flag build-sanity-exe + description: Build a sanity check test executable + default: False +flag full-text-search + description: Enable full-text search in the vendored SQLite library; has no effect if a system SQLite library is used. + default: True +flag uri-filenames + description: Enable URI filenames in the vendored SQLite library; has no effect if a system SQLite library is used. + default: True +flag have-usleep + description: Enable usleep in the vendored SQLite library; has no effect if a system SQLite library is used. + default: True +flag json1 + description: Enable json1 in the vendored SQLite library; has no effect if a system SQLite library is used. + default: True +flag use-stat3 + description: This flag is now a no-op, as the corresponding SQLite option is now a no-op; has no effect if a system SQLite library is used. + default: False +flag use-stat4 + description: Enable STAT4 in the vendored SQLite library (supercedes stat3); has no effect if a system SQLite library is used. + default: True + +library + build-depends: base >= 4.9 && < 4.15 + , persistent >= 2.13 && < 3 + , aeson >= 1.0 + , bytestring >= 0.10 + , conduit >= 1.2.12 + , containers >= 0.5 + , microlens-th >= 0.4.1.1 + , monad-logger >= 0.3.25 + , mtl + , resource-pool + , resourcet >= 1.1.9 + , text >= 1.2 + , time + , transformers >= 0.5 + , unliftio-core + , unordered-containers + exposed-modules: Database.Sqlite + Database.Sqlite.Internal + Database.Persist.Sqlite + ghc-options: -Wall + default-language: Haskell2010 + if flag(systemlib) + if flag(use-pkgconfig) + pkgconfig-depends: sqlite3 + else + extra-libraries: sqlite3 + else + c-sources: cbits/sqlite3.c + include-dirs: cbits + includes: sqlite3.h + install-includes: sqlite3.h + cc-options: -fPIC -std=c99 + if flag(full-text-search) + cc-options: -DSQLITE_ENABLE_FTS3 + -DSQLITE_ENABLE_FTS3_PARENTHESIS + -DSQLITE_ENABLE_FTS4 + -DSQLITE_ENABLE_FTS5 + if flag(uri-filenames) + cc-options: -DSQLITE_USE_URI + if flag(have-usleep) + cc-options: -DHAVE_USLEEP + if flag(json1) + cc-options: -DSQLITE_ENABLE_JSON1 + if flag(use-stat4) + cc-options: -DSQLITE_ENABLE_STAT4 + + c-sources: cbits/config.c + + if !os(windows) + extra-libraries: pthread + +source-repository head + type: git + location: git://github.com/yesodweb/persistent.git + +executable sanity + if flag(build-sanity-exe) + buildable: True + else + buildable: False + main-is: sanity.hs + hs-source-dirs: test + build-depends: base + , persistent-sqlite + , monad-logger + default-language: Haskell2010 + +test-suite test + type: exitcode-stdio-1.0 + main-is: main.hs + hs-source-dirs: test + other-modules: + SqliteInit + Database.Persist.Sqlite.CompositeSpec + ghc-options: -Wall + + build-depends: base >= 4.9 && < 5 + , persistent + , persistent-sqlite + , persistent-test + , bytestring + , containers + , conduit + , exceptions + , fast-logger + , hspec >= 2.4 + , HUnit + , microlens + , monad-logger + , mtl + , QuickCheck + , resourcet + , system-fileio + , system-filepath + , temporary + , text + , time + , transformers + , time + , unliftio-core + default-language: Haskell2010