From 66327a2eb1f720a4331570fc231baf43d813be4e Mon Sep 17 00:00:00 2001 From: konsumlamm Date: Tue, 23 Dec 2025 19:32:32 +0100 Subject: [PATCH 1/3] Update `pqueue.cabal` --- pqueue.cabal | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/pqueue.cabal b/pqueue.cabal index 0996ac6..12d3c0b 100644 --- a/pqueue.cabal +++ b/pqueue.cabal @@ -1,8 +1,9 @@ +cabal-version: 2.2 name: pqueue version: 1.6.0.0 category: Data Structures author: Louis Wasserman -license: BSD3 +license: BSD-3-Clause license-file: LICENSE stability: experimental synopsis: Reliable, persistent, fast priority queues. @@ -14,7 +15,6 @@ maintainer: Lennart Spitzner , homepage: https://github.com/lspitzner/pqueue bug-reports: https://github.com/lspitzner/pqueue/issues build-type: Simple -cabal-version: >= 1.10 tested-with: GHC == 9.12.2 GHC == 9.10.3 @@ -30,7 +30,7 @@ tested-with: GHC == 8.2.2 GHC == 8.0.2 -extra-source-files: +extra-doc-files: CHANGELOG.md README.md @@ -43,10 +43,9 @@ library default-language: Haskell2010 build-depends: - { base >= 4.9 && < 4.22 - , deepseq >= 1.3 && < 1.6 - , indexed-traversable >= 0.1 && < 0.2 - } + , base >= 4.9 && < 4.22 + , deepseq >= 1.3 && < 1.6 + , indexed-traversable >= 0.1 && < 0.2 exposed-modules: Data.PQueue.Prio.Min Data.PQueue.Prio.Max @@ -62,9 +61,8 @@ library Data.PQueue.Internals.Down Data.PQueue.Prio.Max.Internals Nattish - if impl(ghc) { + if impl(ghc) default-extensions: DeriveDataTypeable - } other-extensions: BangPatterns , CPP @@ -82,12 +80,11 @@ test-suite test type: exitcode-stdio-1.0 main-is: PQueueTests.hs build-depends: - { base >= 4.9 && < 4.22 - , deepseq >= 1.3 && < 1.6 - , indexed-traversable >= 0.1 && < 0.2 - , tasty - , tasty-quickcheck - } + , base >= 4.9 && < 4.22 + , deepseq >= 1.3 && < 1.6 + , indexed-traversable >= 0.1 && < 0.2 + , tasty + , tasty-quickcheck other-modules: Data.PQueue.Prio.Min Data.PQueue.Prio.Max @@ -108,9 +105,8 @@ test-suite test Validity.PQueue.Prio.BinomialQueue Validity.PQueue.Prio.Min Validity.PQueue.Prio.Max - if impl(ghc) { + if impl(ghc) default-extensions: DeriveDataTypeable - } ghc-options: -Wall -fno-warn-type-defaults @@ -126,7 +122,7 @@ benchmark minqueue-benchmarks KWay.RandomIncreasing ghc-options: -O2 build-depends: - base >= 4.9 && < 5 + , base >= 4.9 && < 5 , pqueue , deepseq >= 1.3 && < 1.6 , random >= 1.2 && < 1.4 @@ -143,7 +139,7 @@ benchmark minpqueue-benchmarks KWay.RandomIncreasing ghc-options: -O2 build-depends: - base >= 4.9 && < 5 + , base >= 4.9 && < 5 , pqueue , deepseq >= 1.3 && < 1.6 , random >= 1.2 && < 1.4 From 8b0f46225451309169e3028d2fc0de7b2ca30193 Mon Sep 17 00:00:00 2001 From: konsumlamm Date: Sun, 28 Dec 2025 19:05:33 +0100 Subject: [PATCH 2/3] Allow `tasty-bench-0.5` --- pqueue.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pqueue.cabal b/pqueue.cabal index 12d3c0b..c68e44a 100644 --- a/pqueue.cabal +++ b/pqueue.cabal @@ -126,7 +126,7 @@ benchmark minqueue-benchmarks , pqueue , deepseq >= 1.3 && < 1.6 , random >= 1.2 && < 1.4 - , tasty-bench >= 0.3 && < 0.5 + , tasty-bench >= 0.3 && < 0.6 benchmark minpqueue-benchmarks default-language: Haskell2010 @@ -143,4 +143,4 @@ benchmark minpqueue-benchmarks , pqueue , deepseq >= 1.3 && < 1.6 , random >= 1.2 && < 1.4 - , tasty-bench >= 0.3 && < 0.5 + , tasty-bench >= 0.3 && < 0.6 From 4ac88030c25b0e469554ece757ff8d47a404bbbc Mon Sep 17 00:00:00 2001 From: konsumlamm Date: Sat, 3 Jan 2026 02:23:24 +0100 Subject: [PATCH 3/3] Support GHC 9.14 --- .github/workflows/haskell-ci.yaml | 2 +- pqueue.cabal | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/haskell-ci.yaml b/.github/workflows/haskell-ci.yaml index b80a38e..15334ba 100644 --- a/.github/workflows/haskell-ci.yaml +++ b/.github/workflows/haskell-ci.yaml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.8', '9.4.8', '9.6.7', '9.8.4', '9.10.3', '9.12.2'] + ghc: ['8.0.2', '8.2.2', '8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.8', '9.4.8', '9.6.7', '9.8.4', '9.10.3', '9.12.2', '9.14.1'] steps: - uses: actions/checkout@v5 - uses: haskell-actions/setup@v2 diff --git a/pqueue.cabal b/pqueue.cabal index c68e44a..88e3841 100644 --- a/pqueue.cabal +++ b/pqueue.cabal @@ -16,6 +16,7 @@ homepage: https://github.com/lspitzner/pqueue bug-reports: https://github.com/lspitzner/pqueue/issues build-type: Simple tested-with: + GHC == 9.14.1 GHC == 9.12.2 GHC == 9.10.3 GHC == 9.8.4 @@ -43,7 +44,7 @@ library default-language: Haskell2010 build-depends: - , base >= 4.9 && < 4.22 + , base >= 4.9 && < 4.23 , deepseq >= 1.3 && < 1.6 , indexed-traversable >= 0.1 && < 0.2 exposed-modules: @@ -80,7 +81,7 @@ test-suite test type: exitcode-stdio-1.0 main-is: PQueueTests.hs build-depends: - , base >= 4.9 && < 4.22 + , base >= 4.9 && < 4.23 , deepseq >= 1.3 && < 1.6 , indexed-traversable >= 0.1 && < 0.2 , tasty