Skip to content

Commit

Permalink
Move to cabal-gild
Browse files Browse the repository at this point in the history
  • Loading branch information
nikita-volkov committed Feb 25, 2024
1 parent 92a6ed9 commit 9b7b8bb
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on-push-to-master-or-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:

format:
uses: nikita-volkov/haskell-hackage-lib-github-actions-workflows/.github/workflows/format.yaml@v2
uses: nikita-volkov/haskell-hackage-lib-github-actions-workflows/.github/workflows/format.yaml@v3
secrets: inherit

check:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on-push-to-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:
jobs:

format:
uses: nikita-volkov/haskell-hackage-lib-github-actions-workflows/.github/workflows/format.yaml@v2
uses: nikita-volkov/haskell-hackage-lib-github-actions-workflows/.github/workflows/format.yaml@v3
secrets: inherit

check:
Expand All @@ -26,7 +26,7 @@ jobs:
needs:
- format
- check
uses: nikita-volkov/haskell-hackage-lib-github-actions-workflows/.github/workflows/release.yaml@v2
uses: nikita-volkov/haskell-hackage-lib-github-actions-workflows/.github/workflows/release.yaml@v3
secrets: inherit
with:
prefix-tag-with-v: false
79 changes: 42 additions & 37 deletions hasql-pool.cabal
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
cabal-version: 3.0
name: hasql-pool
version: 0.10.1
category: Hasql, Database, PostgreSQL
synopsis: Pool of connections for Hasql
homepage: https://github.com/nikita-volkov/hasql-pool
bug-reports: https://github.com/nikita-volkov/hasql-pool/issues
author: Nikita Volkov <[email protected]>
maintainer: Nikita Volkov <[email protected]>
copyright: (c) 2015, Nikita Volkov
license: MIT
license-file: LICENSE
cabal-version: 3.0
name: hasql-pool
version: 0.10.1
category: Hasql, Database, PostgreSQL
synopsis: Pool of connections for Hasql
homepage: https://github.com/nikita-volkov/hasql-pool
bug-reports: https://github.com/nikita-volkov/hasql-pool/issues
author: Nikita Volkov <[email protected]>
maintainer: Nikita Volkov <[email protected]>
copyright: (c) 2015, Nikita Volkov
license: MIT
license-file: LICENSE
extra-source-files: CHANGELOG.md

source-repository head
type: git
type: git
location: git://github.com/nikita-volkov/hasql-pool.git

common base-settings
default-extensions:
NoImplicitPrelude
NoMonomorphismRestriction
BangPatterns
BlockArguments
ConstraintKinds
Expand Down Expand Up @@ -59,36 +57,43 @@ common base-settings
TypeFamilies
TypeOperators
UnboxedTuples
NoImplicitPrelude
NoMonomorphismRestriction

default-language: Haskell2010
default-language: Haskell2010

library
import: base-settings
hs-source-dirs: library
import: base-settings
hs-source-dirs:
src/library/exposed
src/library/other

-- cabal-gild: discover src/library/exposed
exposed-modules:
Hasql.Pool
Hasql.Pool.Observation

other-modules: Hasql.Pool.Prelude
-- cabal-gild: discover src/library/other
other-modules: Hasql.Pool.Prelude
build-depends:
, base >=4.11 && <5
, bytestring >=0.10 && <0.14
, hasql >=1.6.0.1 && <1.7
, stm >=2.5 && <3
, text >=1.2 && <3
, time >=1.9 && <2
, uuid >=1.3 && <2
base >=4.11 && <5,
bytestring >=0.10 && <0.14,
hasql >=1.6.0.1 && <1.7,
stm >=2.5 && <3,
text >=1.2 && <3,
time >=1.9 && <2,
uuid >=1.3 && <2,

test-suite test
import: base-settings
type: exitcode-stdio-1.0
hs-source-dirs: test
main-is: Main.hs
ghc-options: -threaded
import: base-settings
type: exitcode-stdio-1.0
hs-source-dirs: src/test
main-is: Main.hs
ghc-options: -threaded
build-depends:
, async >=2.2 && <3
, hasql
, hasql-pool
, hspec >=2.6 && <3
, random >=1.2 && <2
, rerebase >=1.15 && <2
async >=2.2 && <3,
hasql,
hasql-pool,
hspec >=2.6 && <3,
random >=1.2 && <2,
rerebase >=1.15 && <2,
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 9b7b8bb

Please sign in to comment.