From 86f497df0978222b86e66d9b72d530b327a8797e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20G=C3=B3ngora?= Date: Sun, 6 Sep 2026 10:12:18 -0600 Subject: [PATCH] Lower cabal-version back to 1.18 Diff.cabal declared cabal-version: 3.14 solely to use the new extra-files field for bundling Diff-liquidhaskell.cabal in the sdist. However, such version is not supported by Hackage and could break dependency solving for some comsumers. Switch to extra-source-files, which achieves the same sdist packaging with no functional difference for this use case, and drop cabal-version back to 1.18. This also requires switching the license field from the SPDX identifier BSD-3-Clause back to the legacy BSD3, since SPDX license expressions aren't recognized before cabal-version: 2.2. --- Diff-liquidhaskell/Diff-liquidhaskell.cabal | 4 ++-- Diff.cabal | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Diff-liquidhaskell/Diff-liquidhaskell.cabal b/Diff-liquidhaskell/Diff-liquidhaskell.cabal index 5a9d3c4..fc46f7e 100644 --- a/Diff-liquidhaskell/Diff-liquidhaskell.cabal +++ b/Diff-liquidhaskell/Diff-liquidhaskell.cabal @@ -1,4 +1,4 @@ -cabal-version: 2.4 +cabal-version: 1.18 name: Diff-liquidhaskell version: 0.1.0.0 synopsis: LiquidHaskell static checks for the Diff package @@ -30,7 +30,7 @@ library -- LH version scheme: 0.. -- Update the corresponding versions in .github/workflows/liquidhaskell.yml -- after upgrading GHC and LH to keep CI in sync. - , liquidhaskell ^>= 0.9.14.1.1 + , liquidhaskell ==0.9.14.1.1 -- Recompilation check is disabled to make sure changes to specification -- annotations are checked by the LH plugin (otherwise they are silently ignored -- if no source change is introduced). diff --git a/Diff.cabal b/Diff.cabal index 03e8198..2caa97c 100644 --- a/Diff.cabal +++ b/Diff.cabal @@ -1,4 +1,4 @@ -Cabal-Version: 3.14 +Cabal-Version: 1.18 name: Diff version: 2.0.1 synopsis: Diff algorithm in pure Haskell @@ -8,13 +8,13 @@ description: Implementation of the standard diff algorithm in Haskell. Space complexity is O(D^2). Includes utilities for pretty printing. category: Algorithms homepage: https://web.archive.org/web/20150326181224/http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927 -license: BSD-3-Clause +license: BSD3 license-file: LICENSE author: Sterling Clover maintainer: David Fox build-Type: Simple extra-doc-files: README.md, CHANGELOG.md -extra-files: ./Diff-liquidhaskell/Diff-liquidhaskell.cabal +extra-source-files: ./Diff-liquidhaskell/Diff-liquidhaskell.cabal bug-reports: https://github.com/seereason/Diff/issues tested-with: