haskell-spdx/trunk/cabal-3.4.patch

   1 From 8afaa090a5f52a9dbde057b79ccf9739bcef8812 Mon Sep 17 00:00:00 2001
   2 From: Oleg Grenrus <oleg.grenrus@iki.fi>
   3 Date: Sat, 6 Feb 2021 11:55:15 +0200
   4 Subject: [PATCH] Allow Cabal-3.4
   5
   6 ---
   7  spdx.cabal          | 6 +++---
   8  tests/Generators.hs | 4 +++-
   9  2 files changed, 6 insertions(+), 4 deletions(-)
  10
  11 diff --git a/spdx.cabal b/spdx.cabal
  12 index a9ad636..4174b21 100644
  13 --- a/spdx.cabal
  14 +++ b/spdx.cabal
  15 @@ -49,7 +49,7 @@ library
  16    ghc-options:      -Wall
  17    build-depends:
  18      , base          >=4.3.0.0 && <4.15
  19 -    , Cabal         ^>=2.4.0.1 || ^>=3.0.0.0 || ^>=3.2.0.0
  20 +    , Cabal         ^>=2.4.0.1 || ^>=3.0.0.0 || ^>=3.2.0.0 || ^>=3.4.0.0
  21      , containers    >=0.5.0.0 && <0.7
  22      , transformers  >=0.3     && <0.6
  23
  24 diff --git a/tests/Generators.hs b/tests/Generators.hs
  25 index 90ef406..1a048d3 100644
  26 --- a/tests/Generators.hs
  27 +++ b/tests/Generators.hs
  28 @@ -15,7 +15,9 @@ import           Distribution.SPDX
  29  import           Distribution.SPDX.Extra.Internal (LatticeSyntax(..))
  30
  31  latestLicenseListVersion :: LicenseListVersion
  32 -#if MIN_VERSION_Cabal(3,0,0)
  33 +#if MIN_VERSION_Cabal(3,4,0)
  34 +latestLicenseListVersion = LicenseListVersion_3_9
  35 +#elif MIN_VERSION_Cabal(3,0,0)
  36  latestLicenseListVersion = LicenseListVersion_3_6
  37  #else
  38  latestLicenseListVersion = LicenseListVersion_3_2