From fa8ef1104a4dcce1a74ad49c201b9cc18ca4a239 Mon Sep 17 00:00:00 2001 From: Jonathan Lamothe Date: Sat, 31 Dec 2022 01:17:30 -0500 Subject: [PATCH] use current LTS resolver --- gemcap.cabal | 8 ++++---- package.yaml | 4 ++-- stack.yaml | 5 +---- stack.yaml.lock | 18 +++++------------- 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/gemcap.cabal b/gemcap.cabal index 6a7a6c1..4c67b2d 100644 --- a/gemcap.cabal +++ b/gemcap.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.35.0. -- -- see: https://github.com/sol/hpack @@ -34,7 +34,7 @@ library ghc-options: -Wall build-depends: base >=4.7 && <5 - , bytestring >=0.10.12.0 && <0.11 + , bytestring >=0.11.3.1 && <0.12 , io-streams , network , tcp-streams >=1.0.1.1 && <1.1 @@ -58,9 +58,9 @@ test-suite gemcap-test ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N build-depends: base >=4.7 && <5 - , bytestring >=0.10.12.0 && <0.11 + , bytestring >=0.11.3.1 && <0.12 , gemcap - , hspec >=2.7.10 && <2.8 + , hspec >=2.9.7 && <2.10 , io-streams , network , tcp-streams >=1.0.1.1 && <1.1 diff --git a/package.yaml b/package.yaml index 81c08a9..d7e2308 100644 --- a/package.yaml +++ b/package.yaml @@ -25,7 +25,7 @@ ghc-options: dependencies: - base >= 4.7 && < 5 -- bytestring >= 0.10.12.0 && < 0.11 +- bytestring >= 0.11.3.1 && < 0.12 - tcp-streams >= 1.0.1.1 && < 1.1 - text >= 1.2.4.1 && < 1.3 - io-streams @@ -49,6 +49,6 @@ tests: - -with-rtsopts=-N dependencies: - gemcap - - hspec >= 2.7.10 && < 2.8 + - hspec >= 2.9.7 && < 2.10 verbatim: <<: *paths \ No newline at end of file diff --git a/stack.yaml b/stack.yaml index 34bb3ec..d8ddc1e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,8 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/13.yaml +resolver: lts-20.5 # User packages to be built. # Various formats can be used as shown in the example below. @@ -40,8 +39,6 @@ packages: # - git: https://github.com/commercialhaskell/stack.git # commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a # -extra-deps: -- tcp-streams-1.0.1.1@sha256:35e9ecfa515797052f8c3c01834d2daebd5e93f3152c7fc98b32652bf6f0c052,2329 # Override default flag values for local packages and extra-deps # flags: {} diff --git a/stack.yaml.lock b/stack.yaml.lock index 402ea50..f8dc00e 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -3,18 +3,10 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: -- completed: - hackage: tcp-streams-1.0.1.1@sha256:35e9ecfa515797052f8c3c01834d2daebd5e93f3152c7fc98b32652bf6f0c052,2329 - pantry-tree: - size: 1004 - sha256: 572071fca40a0b6c4cc950d10277a6f12e83cf4846882b6ef83fcccaa2c18c45 - original: - hackage: tcp-streams-1.0.1.1@sha256:35e9ecfa515797052f8c3c01834d2daebd5e93f3152c7fc98b32652bf6f0c052,2329 +packages: [] snapshots: - completed: - size: 586268 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/13.yaml - sha256: d9e658a22cfe8d87a64fdf219885f942fef5fe2bcb156a9800174911c5da2443 - original: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/13.yaml + sha256: a684cdbdf9304b325a503e0fe1d9648e9c18155ce4c7cfebbe8a7f93674e6295 + size: 649106 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/5.yaml + original: lts-20.5