Skip to content

Fix compilation of hackage-security test suite with Cabal-syntax on Hackage and bump version of hackage-repo-tool before release #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 13, 2022
Merged

Fix compilation of hackage-security test suite with Cabal-syntax on Hackage and bump version of hackage-repo-tool before release #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
305855f
Bump version of hackage-repo-tool before release
Mikolaj Aug 12, 2022
c8fb6ae
Bump Cabal-syntax bound to let it work on master branch of cabal
Mikolaj Aug 12, 2022
45c25ef
Fix compilation of hackage-security tests
Mikolaj Aug 12, 2022
737ad61
Hack around problems with old GHCs; please review
Mikolaj Aug 12, 2022
2336bc3
Wipe out the 'revision' field before release
Mikolaj Aug 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions hackage-repo-tool/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
0.1.1.3
-------
* Compat release for `Cabal-syntax-3.8.1.0`

0.1.1.2
-------
* Compat release for `hackage-security-0.6`
Expand Down
4 changes: 2 additions & 2 deletions hackage-repo-tool/hackage-repo-tool.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12
name: hackage-repo-tool
version: 0.1.1.2
version: 0.1.1.3

build-type: Simple
synopsis: Manage secure file-based package repositories
Expand Down Expand Up @@ -90,7 +90,7 @@ executable hackage-repo-tool
build-depends: network >= 2.5 && < 2.6

if flag(Cabal-syntax)
build-depends: Cabal-syntax >= 3.7 && < 3.9
build-depends: Cabal-syntax >= 3.7 && < 3.10
else
build-depends: Cabal >= 1.14 && < 1.26
|| >= 2.0 && < 2.6
Expand Down
6 changes: 6 additions & 0 deletions hackage-security/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
See also http://pvp.haskell.org/faq

0.6.2.2
-------

* Fix broken compilation of test-suite with Cabal-syntax-3.8.1.0 on Hackage
* Huge README updates

0.6.2.1
-------

Expand Down
16 changes: 10 additions & 6 deletions hackage-security/hackage-security.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
cabal-version: 1.12
name: hackage-security
version: 0.6.2.1
x-revision: 1
version: 0.6.2.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you bump the version, you should delete the x-revision field, (or set the revision to 0 I suppose, but I never tried this).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Thank you.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its not clear to me why there's an x-revision field in the cabal file in the repo at all? typically x-revision is supposed to be managed for you by hackage server.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes it easier to automatically upload the revision with https://github.com/hackage-trustees/hackage-cli


synopsis: Hackage security library
description: The hackage security library provides both server and
Expand Down Expand Up @@ -154,7 +153,7 @@ library
else
build-depends: base >= 4.10

if flag(Cabal-syntax)
if flag(Cabal-syntax) && impl(ghc >= 8.2)
build-depends: Cabal-syntax >= 3.7 && < 3.10
else
build-depends: Cabal >= 1.14 && < 1.26
Expand Down Expand Up @@ -263,7 +262,6 @@ test-suite TestSuite
-- inherited constraints from lib:hackage-security component
build-depends: hackage-security,
base,
Cabal,
containers,
bytestring,
network-uri,
Expand All @@ -272,8 +270,14 @@ test-suite TestSuite
time,
zlib

if flag(Cabal-syntax)
build-depends: Cabal-syntax
if flag(Cabal-syntax) && impl(ghc >= 8.2)
build-depends: Cabal >= 3.7 && < 3.10,
Cabal-syntax >= 3.7 && < 3.10
else
build-depends: Cabal >= 1.14 && < 1.26
|| >= 2.0 && < 2.6
|| >= 3.0 && < 3.7,
Cabal-syntax < 3.7

-- dependencies exclusive to test-suite
build-depends: tasty >= 1.2 && < 1.5,
Expand Down