Skip to content

Commit

Permalink
Modernize and format
Browse files Browse the repository at this point in the history
  • Loading branch information
nikita-volkov committed May 7, 2024
1 parent 0336e0c commit 80eea8a
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 85 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/format.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Format

on:
workflow_call:

jobs:
format:
uses: nikita-volkov/haskell-hackage-lib-github-actions-workflows/.github/workflows/format.yaml@v3
secrets: inherit
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: ./.github/workflows/format.yaml
secrets: inherit

check:
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/on-push-to-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ on:

concurrency:
group: release
cancel-in-progress: false
cancel-in-progress: true

jobs:

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

check:
uses: ./.github/workflows/check.yaml
secrets: inherit
Expand All @@ -26,7 +26,8 @@ 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
docs: true
142 changes: 62 additions & 80 deletions hasql-transaction.cabal
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
name: hasql-transaction
version: 1.1.0.1
category: Hasql, Database, PostgreSQL
cabal-version: 3.0
name: hasql-transaction
version: 1.1.0.1
category: Hasql, Database, PostgreSQL
synopsis:
Composable abstraction over retryable transactions for Hasql

homepage: https://github.com/nikita-volkov/hasql-transaction
bug-reports: https://github.com/nikita-volkov/hasql-transaction/issues
author: Nikita Volkov <[email protected]>
maintainer: Nikita Volkov <[email protected]>
copyright: (c) 2015, Nikita Volkov
license: MIT
license-file: LICENSE
build-type: Simple
cabal-version: >=1.10
homepage: https://github.com/nikita-volkov/hasql-transaction
bug-reports: https://github.com/nikita-volkov/hasql-transaction/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-transaction.git

library
hs-source-dirs: library
common base
default-language: Haskell2010
default-extensions:
NoImplicitPrelude
NoMonomorphismRestriction
Arrows
ApplicativeDo
BangPatterns
BlockArguments
ConstraintKinds
DataKinds
DefaultSignatures
Expand All @@ -34,6 +32,7 @@ library
DeriveFunctor
DeriveGeneric
DeriveTraversable
DerivingVia
EmptyDataDecls
FlexibleContexts
FlexibleInstances
Expand All @@ -42,97 +41,80 @@ library
GeneralizedNewtypeDeriving
LambdaCase
LiberalTypeSynonyms
MagicHash
MultiParamTypeClasses
MultiWayIf
NoImplicitPrelude
NoMonomorphismRestriction
OverloadedStrings
ParallelListComp
PatternGuards
QuasiQuotes
RankNTypes
RecordWildCards
RoleAnnotations
ScopedTypeVariables
StandaloneDeriving
TemplateHaskell
StrictData
TupleSections
TypeFamilies
TypeOperators
UnboxedTuples

default-language: Haskell2010
common executable
import: base
ghc-options:
-O2
-threaded
-with-rtsopts=-N
-rtsopts
-funbox-strict-fields

common test
import: base
ghc-options:
-threaded
-with-rtsopts=-N

library
import: base
hs-source-dirs: library
exposed-modules:
Hasql.Transaction
Hasql.Transaction.Sessions

other-modules:
Hasql.Transaction.Config
Hasql.Transaction.Private.Prelude
Hasql.Transaction.Private.Sessions
Hasql.Transaction.Private.SQL
Hasql.Transaction.Private.Sessions
Hasql.Transaction.Private.Statements
Hasql.Transaction.Private.Transaction

build-depends:
base >=4.12 && <5
, bytestring >=0.10 && <0.13
, bytestring-tree-builder >=0.2.7.8 && <0.3
, contravariant >=1.3 && <2
, contravariant-extras >=0.3 && <0.4
, hasql >=1.6 && <1.7
, mtl >=2.2 && <3
, transformers >=0.5 && <0.7
base >=4.12 && <5,
bytestring >=0.10 && <0.13,
bytestring-tree-builder >=0.2.7.8 && <0.3,
contravariant >=1.3 && <2,
contravariant-extras >=0.3 && <0.4,
hasql >=1.6 && <1.7,
mtl >=2.2 && <3,
transformers >=0.5 && <0.7,

test-suite conflicts-test
type: exitcode-stdio-1.0
hs-source-dirs: conflicts-test
default-extensions:
NoImplicitPrelude
NoMonomorphismRestriction
Arrows
BangPatterns
ConstraintKinds
DataKinds
DefaultSignatures
DeriveDataTypeable
DeriveFoldable
DeriveFunctor
DeriveGeneric
DeriveTraversable
EmptyDataDecls
FlexibleContexts
FlexibleInstances
FunctionalDependencies
GADTs
GeneralizedNewtypeDeriving
LambdaCase
LiberalTypeSynonyms
MagicHash
MultiParamTypeClasses
MultiWayIf
OverloadedStrings
ParallelListComp
PatternGuards
QuasiQuotes
RankNTypes
RecordWildCards
ScopedTypeVariables
StandaloneDeriving
TemplateHaskell
TupleSections
TypeFamilies
TypeOperators
UnboxedTuples

default-language: Haskell2010
main-is: Main.hs
import: test
type: exitcode-stdio-1.0
hs-source-dirs: conflicts-test
main-is: Main.hs
other-modules:
Main.Statements
Main.Transactions

ghc-options: -O2 -threaded -with-rtsopts=-N
ghc-options:
-O2
-threaded
-with-rtsopts=-N

build-depends:
async >=2.1 && <3
, contravariant-extras >=0.3 && <0.4
, hasql
, hasql-transaction
, rerebase >=1.11 && <2
async >=2.1 && <3,
contravariant-extras >=0.3 && <0.4,
hasql,
hasql-transaction,
rerebase >=1.11 && <2,

0 comments on commit 80eea8a

Please sign in to comment.