From abf557f00c641e97c9c170ae94d8a51546b6be3f Mon Sep 17 00:00:00 2001 From: Tommy Bidne Date: Wed, 9 Jul 2025 12:19:08 +1200 Subject: [PATCH 1/4] Relax optparse-applicative upper bound --- dhall-bash/dhall-bash.cabal | 2 +- dhall-docs/dhall-docs.cabal | 2 +- dhall-json/dhall-json.cabal | 2 +- dhall-lsp-server/dhall-lsp-server.cabal | 2 +- dhall-nixpkgs/dhall-nixpkgs.cabal | 2 +- dhall-openapi/dhall-openapi.cabal | 2 +- dhall-toml/dhall-toml.cabal | 2 +- dhall-yaml/dhall-yaml.cabal | 2 +- dhall/dhall.cabal | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dhall-bash/dhall-bash.cabal b/dhall-bash/dhall-bash.cabal index 02aa6dbfa..8ea04fdc8 100644 --- a/dhall-bash/dhall-bash.cabal +++ b/dhall-bash/dhall-bash.cabal @@ -48,7 +48,7 @@ Executable dhall-to-bash bytestring , dhall , dhall-bash , - optparse-applicative >= 0.14.0.0 && < 0.19, + optparse-applicative >= 0.14.0.0 && < 0.20, text GHC-Options: -Wall Default-Language: Haskell2010 diff --git a/dhall-docs/dhall-docs.cabal b/dhall-docs/dhall-docs.cabal index e9fa8efd0..a743c3766 100644 --- a/dhall-docs/dhall-docs.cabal +++ b/dhall-docs/dhall-docs.cabal @@ -86,7 +86,7 @@ Library text >= 0.11.1.0 && < 2.2 , transformers >= 0.2.0.0 && < 0.7 , mtl >= 2.2.1 && < 2.4 , - optparse-applicative >= 0.14.0.0 && < 0.19 + optparse-applicative >= 0.14.0.0 && < 0.20 Exposed-Modules: Dhall.Docs Dhall.Docs.Core diff --git a/dhall-json/dhall-json.cabal b/dhall-json/dhall-json.cabal index 78c4788c8..9f1157e26 100644 --- a/dhall-json/dhall-json.cabal +++ b/dhall-json/dhall-json.cabal @@ -47,7 +47,7 @@ Library exceptions >= 0.8.3 && < 0.11, filepath < 1.6 , microlens >= 0.4.14.0 && < 0.5 , - optparse-applicative >= 0.14.0.0 && < 0.19, + optparse-applicative >= 0.14.0.0 && < 0.20, prettyprinter >= 1.7.0 && < 1.8 , scientific >= 0.3.0.0 && < 0.4 , text >= 0.11.1.0 && < 2.2 , diff --git a/dhall-lsp-server/dhall-lsp-server.cabal b/dhall-lsp-server/dhall-lsp-server.cabal index 1ed3ec7b7..18a59dc61 100644 --- a/dhall-lsp-server/dhall-lsp-server.cabal +++ b/dhall-lsp-server/dhall-lsp-server.cabal @@ -79,7 +79,7 @@ executable dhall-lsp-server build-depends: base >= 4.11 && < 5 , dhall-lsp-server - , optparse-applicative + , optparse-applicative >= 0.14.0.0 && < 0.20 default-language: Haskell2010 GHC-Options: -Wall -fwarn-incomplete-uni-patterns diff --git a/dhall-nixpkgs/dhall-nixpkgs.cabal b/dhall-nixpkgs/dhall-nixpkgs.cabal index 874a75794..6482b002a 100644 --- a/dhall-nixpkgs/dhall-nixpkgs.cabal +++ b/dhall-nixpkgs/dhall-nixpkgs.cabal @@ -31,7 +31,7 @@ Executable dhall-to-nixpkgs , megaparsec >= 7.0.0 && < 10 , mmorph < 1.3 , neat-interpolation < 0.6 - , optparse-applicative >= 0.14.0.0 && < 0.19 + , optparse-applicative >= 0.14.0.0 && < 0.20 , prettyprinter >= 1.7.0 && < 1.8 , text >= 0.11.1.0 && < 2.2 , transformers >= 0.2.0.0 && < 0.7 diff --git a/dhall-openapi/dhall-openapi.cabal b/dhall-openapi/dhall-openapi.cabal index 56f186b39..f8195c16b 100644 --- a/dhall-openapi/dhall-openapi.cabal +++ b/dhall-openapi/dhall-openapi.cabal @@ -45,7 +45,7 @@ Executable openapi-to-dhall filepath >= 1.4 && < 1.6 , -- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469 megaparsec >= 7.0 && < 10 , - optparse-applicative >= 0.14.3.0 && < 0.19, + optparse-applicative >= 0.14.3.0 && < 0.20, parser-combinators , prettyprinter , sort , diff --git a/dhall-toml/dhall-toml.cabal b/dhall-toml/dhall-toml.cabal index edc52e15d..acd6a3441 100644 --- a/dhall-toml/dhall-toml.cabal +++ b/dhall-toml/dhall-toml.cabal @@ -42,7 +42,7 @@ Library containers >= 0.5.9 && < 0.8 , unordered-containers >= 0.2 && < 0.3 , prettyprinter >= 1.7.0 && < 1.8 , - optparse-applicative >= 0.14 && < 0.19 + optparse-applicative >= 0.14 && < 0.20 Exposed-Modules: Dhall.DhallToToml Dhall.TomlToDhall diff --git a/dhall-yaml/dhall-yaml.cabal b/dhall-yaml/dhall-yaml.cabal index f783e4389..625329c55 100644 --- a/dhall-yaml/dhall-yaml.cabal +++ b/dhall-yaml/dhall-yaml.cabal @@ -38,7 +38,7 @@ Library bytestring < 0.13, dhall >= 1.31.0 && < 1.43, dhall-json >= 1.6.0 && < 1.8 , - optparse-applicative >= 0.14.0.0 && < 0.19, + optparse-applicative >= 0.14.0.0 && < 0.20, text >= 0.11.1.0 && < 2.2 , vector Exposed-Modules: diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index df7d9ab89..f2dadbe4b 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -236,7 +236,7 @@ Common common mmorph < 1.3 , mtl >= 2.2.1 && < 2.4 , network-uri >= 2.6 && < 2.7 , - optparse-applicative >= 0.14.0.0 && < 0.19, + optparse-applicative >= 0.14.0.0 && < 0.20, parsers >= 0.12.4 && < 0.13, parser-combinators , prettyprinter >= 1.7.0 && < 1.8 , From dbb371752eddea84a4d4585557a2f356b52e0430 Mon Sep 17 00:00:00 2001 From: Tommy Bidne Date: Wed, 9 Jul 2025 12:50:27 +1200 Subject: [PATCH 2/4] Relax containers upper bound --- dhall-bash/dhall-bash.cabal | 2 +- dhall-csv/dhall-csv.cabal | 2 +- dhall-docs/dhall-docs.cabal | 2 +- dhall-json/dhall-json.cabal | 2 +- dhall-lsp-server/dhall-lsp-server.cabal | 2 +- dhall-nix/dhall-nix.cabal | 2 +- dhall-openapi/dhall-openapi.cabal | 2 +- dhall-toml/dhall-toml.cabal | 2 +- dhall/dhall.cabal | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dhall-bash/dhall-bash.cabal b/dhall-bash/dhall-bash.cabal index 8ea04fdc8..59e6c6e5c 100644 --- a/dhall-bash/dhall-bash.cabal +++ b/dhall-bash/dhall-bash.cabal @@ -29,7 +29,7 @@ Library Build-Depends: base >= 4.11.0.0 && < 5 , bytestring < 0.13, - containers < 0.8 , + containers < 0.9 , dhall >= 1.42.0 && < 1.43, neat-interpolation < 0.6 , shell-escape < 0.3 , diff --git a/dhall-csv/dhall-csv.cabal b/dhall-csv/dhall-csv.cabal index c6115345e..ebee55c9b 100644 --- a/dhall-csv/dhall-csv.cabal +++ b/dhall-csv/dhall-csv.cabal @@ -79,7 +79,7 @@ Library base >= 4.12.0.0 && < 5 , bytestring < 0.13, cassava >= 0.5.0.0 && < 0.6 , - containers >= 0.5.9 && < 0.8 , + containers >= 0.5.9 && < 0.9 , either , exceptions >= 0.8.3 && < 0.11, dhall >= 1.39.0 && < 1.43, diff --git a/dhall-docs/dhall-docs.cabal b/dhall-docs/dhall-docs.cabal index a743c3766..097f7b054 100644 --- a/dhall-docs/dhall-docs.cabal +++ b/dhall-docs/dhall-docs.cabal @@ -68,7 +68,7 @@ Library base >= 4.11.0.0 && < 5 , base16-bytestring >= 1.0.0.0 , bytestring < 0.13, - containers , + containers >= 0.5.11.0 && < 0.9 , cryptohash-sha256 , directory >= 1.3.0.0 && < 1.4 , dhall >= 1.38.0 && < 1.43, diff --git a/dhall-json/dhall-json.cabal b/dhall-json/dhall-json.cabal index 9f1157e26..fc5f17c7e 100644 --- a/dhall-json/dhall-json.cabal +++ b/dhall-json/dhall-json.cabal @@ -42,7 +42,7 @@ Library aeson-pretty >= 0.8.0 && < 0.9 , aeson-yaml >= 1.1.0 && < 1.2 , bytestring < 0.13, - containers >= 0.5.9 && < 0.8 , + containers >= 0.5.9 && < 0.9 , dhall >= 1.42.0 && < 1.43, exceptions >= 0.8.3 && < 0.11, filepath < 1.6 , diff --git a/dhall-lsp-server/dhall-lsp-server.cabal b/dhall-lsp-server/dhall-lsp-server.cabal index 18a59dc61..3fa072601 100644 --- a/dhall-lsp-server/dhall-lsp-server.cabal +++ b/dhall-lsp-server/dhall-lsp-server.cabal @@ -47,7 +47,7 @@ library , base >= 4.11 && < 5 , bytestring >= 0.10.8.2 && < 0.13 , co-log-core >= 0.3.1.0 && < 0.4 - , containers >= 0.5.11.0 && < 0.8 + , containers >= 0.5.11.0 && < 0.9 , data-default >= 0.7.1.1 && < 0.8 , directory >= 1.2.2.0 && < 1.4 , dhall >= 1.38.0 && < 1.43 diff --git a/dhall-nix/dhall-nix.cabal b/dhall-nix/dhall-nix.cabal index 34d3f6824..35e833794 100644 --- a/dhall-nix/dhall-nix.cabal +++ b/dhall-nix/dhall-nix.cabal @@ -27,7 +27,7 @@ Library Hs-Source-Dirs: src Build-Depends: base >= 4.11.0.0 && < 5 , - containers < 0.8 , + containers < 0.9 , data-fix < 0.4 , dhall >= 1.42 && < 1.43, hnix >= 0.16 && < 0.18, diff --git a/dhall-openapi/dhall-openapi.cabal b/dhall-openapi/dhall-openapi.cabal index f8195c16b..065bac37c 100644 --- a/dhall-openapi/dhall-openapi.cabal +++ b/dhall-openapi/dhall-openapi.cabal @@ -78,7 +78,7 @@ Library Build-Depends: base >= 4.11.0.0 && < 5 , aeson >= 1.0.0.0 && < 2.3 , - containers >= 0.5.8.0 && < 0.8 , + containers >= 0.5.8.0 && < 0.9 , dhall >= 1.38.0 && < 1.43 , prettyprinter >= 1.7.0 && < 1.8 , microlens >= 0.4 && < 0.5 , diff --git a/dhall-toml/dhall-toml.cabal b/dhall-toml/dhall-toml.cabal index acd6a3441..627888e77 100644 --- a/dhall-toml/dhall-toml.cabal +++ b/dhall-toml/dhall-toml.cabal @@ -39,7 +39,7 @@ Library filepath < 1.6 , tomland >= 1.3.2.0 && < 1.4 , text >= 0.11.1.0 && < 2.2 , - containers >= 0.5.9 && < 0.8 , + containers >= 0.5.9 && < 0.9 , unordered-containers >= 0.2 && < 0.3 , prettyprinter >= 1.7.0 && < 1.8 , optparse-applicative >= 0.14 && < 0.20 diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index f2dadbe4b..1b1659233 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -215,7 +215,7 @@ Common common case-insensitive < 1.3 , cborg >= 0.2.0.0 && < 0.3 , cborg-json >= 0.2.2.0 && < 0.3 , - containers >= 0.5.8.0 && < 0.8 , + containers >= 0.5.8.0 && < 0.9 , contravariant < 1.6 , data-fix < 0.4 , deepseq < 1.6 , From 407e08cabe9872b7d0511ed1e193ab4b15dd5380 Mon Sep 17 00:00:00 2001 From: Tommy Bidne Date: Wed, 9 Jul 2025 13:09:23 +1200 Subject: [PATCH 3/4] Relax QuickCheck upper bound --- dhall-lsp-server/dhall-lsp-server.cabal | 2 +- dhall/dhall.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dhall-lsp-server/dhall-lsp-server.cabal b/dhall-lsp-server/dhall-lsp-server.cabal index 3fa072601..9bfba4bf4 100644 --- a/dhall-lsp-server/dhall-lsp-server.cabal +++ b/dhall-lsp-server/dhall-lsp-server.cabal @@ -93,7 +93,7 @@ Test-Suite doctest directory >= 1.3.1.5 && < 1.4, filepath < 1.6, doctest >= 0.7.0 , - QuickCheck + QuickCheck >= 2.14 && < 2.17 Other-Extensions: OverloadedStrings RecordWildCards Default-Language: Haskell2010 diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index 1b1659233..f1b9d72e5 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -447,7 +447,7 @@ Test-Suite tasty generic-random >= 1.3.0.0 && < 1.6 , http-client , http-client-tls , - QuickCheck >= 2.14 && < 2.16, + QuickCheck >= 2.14 && < 2.17, quickcheck-instances >= 0.3.12 && < 0.4 , special-values < 0.2 , spoon < 0.4 , From 993fa205f774a88e02d1b27bdd1d22e4c5851b92 Mon Sep 17 00:00:00 2001 From: Tommy Bidne Date: Wed, 9 Jul 2025 13:32:38 +1200 Subject: [PATCH 4/4] Relax data-default upper bound --- dhall-lsp-server/dhall-lsp-server.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhall-lsp-server/dhall-lsp-server.cabal b/dhall-lsp-server/dhall-lsp-server.cabal index 9bfba4bf4..ae153e451 100644 --- a/dhall-lsp-server/dhall-lsp-server.cabal +++ b/dhall-lsp-server/dhall-lsp-server.cabal @@ -48,7 +48,7 @@ library , bytestring >= 0.10.8.2 && < 0.13 , co-log-core >= 0.3.1.0 && < 0.4 , containers >= 0.5.11.0 && < 0.9 - , data-default >= 0.7.1.1 && < 0.8 + , data-default >= 0.7.1.1 && < 0.9 , directory >= 1.2.2.0 && < 1.4 , dhall >= 1.38.0 && < 1.43 , dhall-json >= 1.4 && < 1.8