From 54abc58c8581f9536f33ca30a6028678597b55c3 Mon Sep 17 00:00:00 2001 From: Preetham Gujjula Date: Thu, 11 Apr 2024 14:12:28 -0700 Subject: [PATCH] Use set syntax in dependency lists --- package.yaml | 14 ++++++++------ primecount.cabal | 12 ++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/package.yaml b/package.yaml index 932c35d..87d0a49 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,7 @@ # SPDX-FileCopyrightText: Copyright Preetham Gujjula # SPDX-License-Identifier: BSD-3-Clause +verbatim: + cabal-version: 3.6 name: primecount version: 0.1.0.1 synopsis: Bindings to the primecount library @@ -13,7 +15,7 @@ category: Math, Number Theory description: Please see the README on Github at -tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.5 || ==9.6.2 +tested-with: GHC == {8.10.7, 9.0.2, 9.2.8, 9.4.5, 9.6.2} extra-source-files: - README.md - ChangeLog.md @@ -34,7 +36,7 @@ default-extensions: - ScopedTypeVariables dependencies: -- base >= 4.7 && < 5.0 +- base ^>= {4.7, 4.8, 4.9, 4.10, 4.11, 4.12, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18, 4.19} library: source-dirs: src @@ -53,9 +55,9 @@ tests: main: Main.hs dependencies: - primecount - - silently >= 1.2 && < 1.3 - - tasty >= 1.4 && < 1.6 - - tasty-hunit >= 0.10 && < 0.11 + - silently ^>= {1.2} + - tasty ^>= {1.4, 1.5} + - tasty-hunit ^>= {0.10} other-modules: - Test.Math.NumberTheory.Prime.Count @@ -65,7 +67,7 @@ benchmarks: main: Main.hs dependencies: - primecount - - tasty-bench >= 0.3 && < 0.4 + - tasty-bench ^>= {0.3} when: - condition: false other-modules: Paths_primecount diff --git a/primecount.cabal b/primecount.cabal index fa2ad10..d3701ba 100644 --- a/primecount.cabal +++ b/primecount.cabal @@ -1,4 +1,4 @@ -cabal-version: 2.2 +cabal-version: 3.6 -- This file has been generated from package.yaml by hpack version 0.36.0. -- @@ -18,7 +18,7 @@ license: BSD-3-Clause license-file: LICENSES/BSD-3-Clause.txt build-type: Simple tested-with: - GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.5 || ==9.6.2 + GHC == {8.10.7, 9.0.2, 9.2.8, 9.4.5, 9.6.2} extra-source-files: README.md ChangeLog.md @@ -39,7 +39,7 @@ library extra-libraries: primecount build-depends: - base >=4.7 && <5.0 + base >=4.7 && <4.8 || >=4.8 && <4.9 || >=4.9 && <4.10 || >=4.10 && <4.11 || >=4.11 && <4.12 || >=4.12 && <4.13 || >=4.13 && <4.14 || >=4.14 && <4.15 || >=4.15 && <4.16 || >=4.16 && <4.17 || >=4.17 && <4.18 || >=4.18 && <4.19 || >=4.19 && <4.20 default-language: Haskell2010 test-suite primecount-tests @@ -53,10 +53,10 @@ test-suite primecount-tests ScopedTypeVariables ghc-options: -Wall -Wcompat -Wmissing-export-lists -Wincomplete-record-updates -Wpartial-fields -Wmissing-home-modules -Werror=missing-home-modules -Widentities -Wredundant-constraints -Wmissing-export-lists build-depends: - base >=4.7 && <5.0 + base >=4.7 && <4.8 || >=4.8 && <4.9 || >=4.9 && <4.10 || >=4.10 && <4.11 || >=4.11 && <4.12 || >=4.12 && <4.13 || >=4.13 && <4.14 || >=4.14 && <4.15 || >=4.15 && <4.16 || >=4.16 && <4.17 || >=4.17 && <4.18 || >=4.18 && <4.19 || >=4.19 && <4.20 , primecount , silently ==1.2.* - , tasty >=1.4 && <1.6 + , tasty >=1.4 && <1.5 || >=1.5 && <1.6 , tasty-hunit ==0.10.* default-language: Haskell2010 @@ -69,7 +69,7 @@ benchmark primecount-bench ScopedTypeVariables ghc-options: -Wall -Wcompat -Wmissing-export-lists -Wincomplete-record-updates -Wpartial-fields -Wmissing-home-modules -Werror=missing-home-modules -Widentities -Wredundant-constraints -Wmissing-export-lists build-depends: - base >=4.7 && <5.0 + base >=4.7 && <4.8 || >=4.8 && <4.9 || >=4.9 && <4.10 || >=4.10 && <4.11 || >=4.11 && <4.12 || >=4.12 && <4.13 || >=4.13 && <4.14 || >=4.14 && <4.15 || >=4.15 && <4.16 || >=4.16 && <4.17 || >=4.17 && <4.18 || >=4.18 && <4.19 || >=4.19 && <4.20 , primecount , tasty-bench ==0.3.* default-language: Haskell2010