Skip to content

Commit c79e8bb

Browse files
authored
Merge pull request #89 from haskell-cryptography/jdral/cabal-gild
Use `cabal-gild` for formatting
2 parents 4331628 + 227d13e commit c79e8bb

File tree

6 files changed

+200
-184
lines changed

6 files changed

+200
-184
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -211,28 +211,28 @@ jobs:
211211
SKIP_CABAL_BUILD: true
212212

213213
################################################################################
214-
# Lint with cabal-fmt
214+
# Lint with cabal-gild
215215
################################################################################
216-
lint-cabal-fmt:
217-
name: Lint with cabal-fmt
216+
lint-cabal-gild:
217+
name: Lint with cabal-gild
218218
runs-on: ubuntu-latest
219219
steps:
220220
- name: 📥 Checkout repository
221221
uses: actions/checkout@v6
222222

223-
- name: 🛠️ Setup cabal-fmt
224-
uses: jorisdral/actions/setup-cabal-fmt@main
223+
- name: 🛠️ Setup cabal-gild
224+
uses: jorisdral/actions/setup-cabal-[email protected]
225225
with:
226-
cabal-fmt-version: "0.1.12"
226+
cabal-gild-version: "1.5.0.1"
227227
ghc-version: "9.6"
228-
cabal-version: "3.12"
228+
cabal-version: "3.16"
229229
# The index-state is fixed to enable caching and ensure that the version
230230
# regardless of the current state of Hackage head.
231-
# If you want a newer version of cabal-fmt, use a more recent time.
232-
hackage-index-state: "2025-09-15T11:44:03Z"
231+
# If you want a newer version of cabal-gild, use a more recent time.
232+
hackage-index-state: "2025-12-08T00:00:00Z"
233233

234-
- name: 🎗️ Lint with cabal-fmt
235-
run: ./scripts/format-cabal-fmt.sh && git diff --exit-code
234+
- name: 🎗️ Lint with cabal-gild
235+
run: ./scripts/format-cabal-gild.sh && git diff --exit-code
236236

237237
################################################################################
238238
# Lint with cabal
Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
cabal-version: 3.0
2-
name: botan-bindings
3-
version: 0.1.0.0
4-
synopsis: Raw Botan bindings
1+
cabal-version: 3.0
2+
name: botan-bindings
3+
version: 0.1.0.0
4+
synopsis: Raw Botan bindings
55
description:
66
Welcome to botan-bindings
77

@@ -14,57 +14,63 @@ description:
1414

1515
For more information, see the [README on Github](https://github.com/haskellfoundation/botan)
1616

17-
author: Leo D.
18-
19-
license: BSD-3-Clause
20-
license-file: LICENSE
17+
author: Leo D.
18+
19+
license: BSD-3-Clause
20+
license-file: LICENSE
2121
copyright:
2222
Copyright (c) 2023-2024, Apotheca Labs
2323
Copyright (c) 2024-2025, Haskell Foundation
2424

25-
build-type: Simple
26-
category: Cryptography
25+
build-type: Simple
26+
category: Cryptography
2727
extra-doc-files:
2828
CHANGELOG.md
2929
README.md
3030

31-
tested-with: GHC ==9.2 || ==9.4 || ==9.6 || ==9.8 || ==9.10 || ==9.12
31+
tested-with: ghc ==9.2 || ==9.4 || ==9.6 || ==9.8 || ==9.10 || ==9.12
3232

3333
source-repository head
34-
type: git
34+
type: git
3535
location: https://github.com/haskellfoundation/botan
36-
subdir: botan-bindings
36+
subdir: botan-bindings
3737

3838
source-repository this
39-
type: git
39+
type: git
4040
location: https://github.com/haskellfoundation/botan
41-
subdir: botan-bindings
42-
tag: botan-bindings-0.1.0.0
41+
subdir: botan-bindings
42+
tag: botan-bindings-0.1.0.0
4343

4444
flag pkg-config
45-
default: True
46-
manual: False
45+
default: True
46+
manual: False
4747
description: Use @pkg-config(1)@ to locate foreign @botan-3@ library.
4848

4949
common warnings
5050
ghc-options:
51-
-Wall -Wcompat -Wincomplete-uni-patterns
52-
-Wincomplete-record-updates -Wpartial-fields -Widentities
53-
-Wredundant-constraints -Wmissing-export-lists
54-
-Wno-unticked-promoted-constructors -Wunused-packages
51+
-Wall
52+
-Wcompat
53+
-Wincomplete-uni-patterns
54+
-Wincomplete-record-updates
55+
-Wpartial-fields
56+
-Widentities
57+
-Wredundant-constraints
58+
-Wmissing-export-lists
59+
-Wno-unticked-promoted-constructors
60+
-Wunused-packages
5561
-Wmissing-deriving-strategies
5662

5763
common language
58-
default-language: GHC2021
64+
default-language: GHC2021
5965
default-extensions:
6066
DerivingStrategies
6167
PatternSynonyms
6268
RecordWildCards
6369
RoleAnnotations
6470

6571
library
66-
import: warnings, language
67-
hs-source-dirs: src
72+
import: warnings, language
73+
hs-source-dirs: src
6874
default-extensions:
6975
NoImplicitPrelude
7076
OverloadedStrings
@@ -75,17 +81,17 @@ library
7581
Botan.Bindings.Cipher
7682
Botan.Bindings.Error
7783
Botan.Bindings.FPE
78-
Botan.Bindings.Hash
7984
Botan.Bindings.HOTP
85+
Botan.Bindings.Hash
8086
Botan.Bindings.KDF
8187
Botan.Bindings.KeyWrap
8288
Botan.Bindings.MAC
8389
Botan.Bindings.MPI
8490
Botan.Bindings.Prelude
8591
Botan.Bindings.PubKey
86-
Botan.Bindings.PubKey.Decrypt
8792
Botan.Bindings.PubKey.DH
8893
Botan.Bindings.PubKey.DSA
94+
Botan.Bindings.PubKey.Decrypt
8995
Botan.Bindings.PubKey.ECDH
9096
Botan.Bindings.PubKey.ECDSA
9197
Botan.Bindings.PubKey.Ed25519
@@ -94,8 +100,8 @@ library
94100
Botan.Bindings.PubKey.KeyAgreement
95101
Botan.Bindings.PubKey.KeyEncapsulation
96102
Botan.Bindings.PubKey.RSA
97-
Botan.Bindings.PubKey.Sign
98103
Botan.Bindings.PubKey.SM2
104+
Botan.Bindings.PubKey.Sign
99105
Botan.Bindings.PubKey.Verify
100106
Botan.Bindings.PubKey.X25519
101107
Botan.Bindings.PwdHash
@@ -108,14 +114,13 @@ library
108114
Botan.Bindings.X509
109115
Botan.Bindings.ZFEC
110116

111-
other-modules: Paths_botan_bindings
112-
autogen-modules: Paths_botan_bindings
113-
build-depends: base >=4.16 && <4.22
114-
includes: botan/ffi.h
117+
other-modules: Paths_botan_bindings
118+
autogen-modules: Paths_botan_bindings
119+
build-depends: base >=4.16 && <4.22
120+
includes: botan/ffi.h
115121

116122
if flag(pkg-config)
117123
-- NB: pkg-config is available on windows as well when using msys2
118124
pkgconfig-depends: botan-3 >=3.0.0
119-
120125
else
121126
extra-libraries: botan-3

0 commit comments

Comments
 (0)