From 2187fa8f822f4fd485df47511548df9d1a341e2c Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Tue, 21 Mar 2023 00:59:11 +0000 Subject: [PATCH] Relax upper bound on Cabal dependency Also bumps Stack YAML to latest Stackage nightly snapshot (which includes network-3.1.2.9). Also updates package.YAML/Cabal file for dependency on network >= 3.1.2.9 on Windows with GHC >= 9.4.5. --- hpack.cabal | 17 +++++++++++++---- package.yaml | 7 ++++++- stack.yaml | 2 +- stack.yaml.lock | 8 ++++---- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/hpack.cabal b/hpack.cabal index c3afddb4..13a3966f 100644 --- a/hpack.cabal +++ b/hpack.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.35.1. +-- This file has been generated from package.yaml by hpack version 0.35.2. -- -- see: https://github.com/sol/hpack @@ -28,7 +28,7 @@ library src ghc-options: -Wall -fno-warn-incomplete-uni-patterns build-depends: - Cabal >=3.0.0.0 && <3.9 + Cabal >=3.0.0.0 && <3.11 , Glob >=0.9.0 , aeson >=1.4.3.0 , base >=4.9 && <5 @@ -83,6 +83,9 @@ library Path Paths_hpack default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 executable hpack main-is: Main.hs @@ -90,7 +93,7 @@ executable hpack driver ghc-options: -Wall -fno-warn-incomplete-uni-patterns build-depends: - Cabal >=3.0.0.0 && <3.9 + Cabal >=3.0.0.0 && <3.11 , Glob >=0.9.0 , aeson >=1.4.3.0 , base >=4.9 && <5 @@ -116,6 +119,9 @@ executable hpack other-modules: Paths_hpack default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 test-suite spec type: exitcode-stdio-1.0 @@ -126,7 +132,7 @@ test-suite spec ghc-options: -Wall -fno-warn-incomplete-uni-patterns cpp-options: -DTEST build-depends: - Cabal >=3.0.0.0 && <3.9 + Cabal >=3.0.0.0 && <3.11 , Glob >=0.9.0 , HUnit >=1.6.0.0 , QuickCheck @@ -211,3 +217,6 @@ test-suite spec Path Paths_hpack default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 diff --git a/package.yaml b/package.yaml index 1c3b80ac..4780b6fe 100644 --- a/package.yaml +++ b/package.yaml @@ -24,7 +24,7 @@ dependencies: - yaml >= 0.10.0 - aeson >= 1.4.3.0 - scientific - - Cabal >= 3.0.0.0 && < 3.9 + - Cabal >= 3.0.0.0 && < 3.11 - pretty - bifunctors - cryptonite @@ -35,6 +35,11 @@ dependencies: - vector - infer-license >= 0.2.0 && < 0.3 +# See https://github.com/haskell/network/pull/552. +when: + condition: impl(ghc >= 9.4.5) && os(windows) + dependencies: network >= 3.1.2.9 + library: source-dirs: src exposed-modules: diff --git a/stack.yaml b/stack.yaml index 819610b8..19f09466 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1 @@ -resolver: nightly-2023-02-23 +resolver: nightly-2023-05-03 # GHC 9.4.5 diff --git a/stack.yaml.lock b/stack.yaml.lock index 8cab195a..73330cc6 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - sha256: 1f4620e9e6768c6d08bc95e644fb13a28464b430853b3cf944b8cd51ec62cecf - size: 598113 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/2/23.yaml - original: nightly-2023-02-23 + sha256: 5eb95e9f352b5cc0f192b5039ee2f19c88bddf53928b29a2efc54bc1697ab1ea + size: 625217 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/5/3.yaml + original: nightly-2023-05-03