Updated flag name and adjusted bounds

haskell · Nov 6, 2021 · c7333a1 · c7333a1
1 parent b1a28ee
commit c7333a1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/example-client/example-client.cabal b/example-client/example-client.cabal
@@ -17,9 +17,10 @@ flag use-network-uri
  description: Are we using network-uri?
  manual: False
 
-flag use-cabal-syntax
+flag Cabal-syntax
  description: Are we using Cabal-syntax?
  manual: False
+ default: True
 
 executable example-client
  main-is: Main.hs
@@ -52,7 +53,8 @@ executable example-client
  else
  build-depends: network >= 2.5 && < 2.6
 
- if flag(use-cabal-syntax)
+ if flag(Cabal-syntax)
  build-depends: Cabal-syntax >= 3.7 && < 3.9
  else
- build-depends: Cabal >= 1.12 && < 3.7
+ build-depends: Cabal >= 1.12 && < 3.7,
+ Cabal-syntax < 3.7
diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal
@@ -39,9 +39,10 @@ flag use-old-time
  description: Are we using @old-time@?
  manual: False
 
-flag use-cabal-syntax
+flag Cabal-syntax
  description: Are we using Cabal-syntax?
  manual: False
+ default: True
 
 executable hackage-repo-tool
  hs-source-dirs: src
@@ -85,12 +86,13 @@ executable hackage-repo-tool
  else
  build-depends: network >= 2.5 && < 2.6
 
- if flag(use-cabal-syntax)
+ if flag(Cabal-syntax)
  build-depends: Cabal-syntax >= 3.7 && < 3.9
  else
  build-depends: Cabal >= 1.14 && < 1.26
  || >= 2.0 && < 2.6
- || >= 3.0 && < 3.7
+ || >= 3.0 && < 3.7,
+ Cabal-syntax < 3.7
 
 
  default-language: Haskell2010

diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal
@@ -48,9 +48,10 @@ flag use-network-uri
  description: Are we using @network-uri@?
  manual: False
 
-flag use-cabal-syntax
+flag Cabal-syntax
  description: Are we using Cabal-syntax?
  manual: False
+ default: True
 
 flag old-directory
  description: Use @directory@ < 1.2 and @old-time@
@@ -150,12 +151,13 @@ library
  else
  build-depends: base >= 4.10
 
- if flag(use-cabal-syntax)
+ if flag(Cabal-syntax)
  build-depends: Cabal-syntax >= 3.7 && < 3.9
  else
  build-depends: Cabal >= 1.14 && < 1.26
  || >= 2.0 && < 2.6
- || >= 3.0 && < 3.7
+ || >= 3.0 && < 3.7,
+ Cabal-syntax < 3.7
 
  hs-source-dirs: src
  default-language: Haskell2010
@@ -269,7 +271,7 @@ test-suite TestSuite
  else
  build-depends: network
 
- if flag(use-cabal-syntax)
+ if flag(Cabal-syntax)
  build-depends: Cabal-syntax
 
  -- dependencies exclusive to test-suite