Skip to content

Commit 99386c1

Browse files
sheafmergify[bot]
andauthored
3.14: make Cabal-hooks version track Cabal version (haskell#10579)
* Make Cabal-hooks version track Cabal version As pointed out in haskell#10412, it isn't currently feasible to version the Cabal-hooks version separately from Cabal due to the large amount of re-exports (in particular the LocalBuildInfo type and its dependencies). For the time being, we will version Cabal-hooks along with the major Cabal library version. * Update Cabal-hooks/changelog.md --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 269fd80 commit 99386c1

File tree

9 files changed

+11
-13
lines changed

9 files changed

+11
-13
lines changed

Cabal-hooks/Cabal-hooks.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-hooks
3-
version: 0.1
3+
version: 3.14
44
copyright: 2023, Cabal Development Team
55
license: BSD-3-Clause
66
license-file: LICENSE

Cabal-hooks/changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog for `Cabal-hooks`
22

3-
## 0.1December 2023
3+
## 3.14November 2024
44

55
* Initial release of the `Hooks` API.
66

Cabal-hooks/src/Distribution/Simple/SetupHooks.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ Usage example:
260260
> custom-setup
261261
> setup-depends:
262262
> base >= 4.18 && < 5,
263-
> Cabal-hooks >= 0.1 && < 0.2
263+
> Cabal-hooks >= 3.14 && < 3.15
264264
>
265265
> The declared Cabal version should also be at least 3.14.
266266

bootstrap/linux-9.0.2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
"revision": null,
203203
"source": "local",
204204
"src_sha256": null,
205-
"version": "0.1"
205+
"version": "3.14"
206206
},
207207
{
208208
"cabal_sha256": "60e78b6c60dc32a77ce6c37ed5ca4e838fc5f76f02836ef64d93cd21cc002325",

bootstrap/linux-9.2.8.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
"revision": null,
173173
"source": "local",
174174
"src_sha256": null,
175-
"version": "0.1"
175+
"version": "3.14"
176176
},
177177
{
178178
"cabal_sha256": "60e78b6c60dc32a77ce6c37ed5ca4e838fc5f76f02836ef64d93cd21cc002325",

bootstrap/linux-9.4.8.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
"revision": null,
173173
"source": "local",
174174
"src_sha256": null,
175-
"version": "0.1"
175+
"version": "3.14"
176176
},
177177
{
178178
"cabal_sha256": "60e78b6c60dc32a77ce6c37ed5ca4e838fc5f76f02836ef64d93cd21cc002325",

bootstrap/linux-9.6.4.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
"revision": null,
133133
"source": "local",
134134
"src_sha256": null,
135-
"version": "0.1"
135+
"version": "3.14"
136136
},
137137
{
138138
"cabal_sha256": "60e78b6c60dc32a77ce6c37ed5ca4e838fc5f76f02836ef64d93cd21cc002325",

bootstrap/linux-9.8.2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"revision": null,
137137
"source": "local",
138138
"src_sha256": null,
139-
"version": "0.1"
139+
"version": "3.14"
140140
},
141141
{
142142
"cabal_sha256": "60e78b6c60dc32a77ce6c37ed5ca4e838fc5f76f02836ef64d93cd21cc002325",

cabal-testsuite/main/cabal-tests.hs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,10 @@ buildCabalLibsSpecific ver verb mbGhc builddir_rel = do
161161
csgot <- doesDirectoryExist (dir </> "Cabal-syntax-" ++ ver)
162162
unless csgot $
163163
runProgramInvocation verb ((programInvocation cabal ["get", "Cabal-syntax-" ++ ver]) { progInvokeCwd = Just dir })
164-
let hooksVerFromVer _ = "0.1"
165-
hooksVer = hooksVerFromVer ver
166-
chgot <- doesDirectoryExist (dir </> "Cabal-hooks-" ++ hooksVer)
164+
chgot <- doesDirectoryExist (dir </> "Cabal-hooks-" ++ ver)
167165
unless chgot $
168-
runProgramInvocation verb ((programInvocation cabal ["get", "Cabal-hooks-" ++ hooksVer]) { progInvokeCwd = Just dir })
169-
buildCabalLibsProject ("packages: Cabal-" ++ ver ++ " Cabal-syntax-" ++ ver ++ " Cabal-hooks-" ++ hooksVer) verb mbGhc dir
166+
runProgramInvocation verb ((programInvocation cabal ["get", "Cabal-hooks-" ++ ver]) { progInvokeCwd = Just dir })
167+
buildCabalLibsProject ("packages: Cabal-" ++ ver ++ " Cabal-syntax-" ++ ver ++ " Cabal-hooks-" ++ ver) verb mbGhc dir
170168

171169

172170
buildCabalLibsIntree :: String -> Verbosity -> Maybe FilePath -> FilePath -> IO [FilePath]

0 commit comments

Comments
 (0)