From 9473eabf112c2777f2f5628ee6839667d796bde9 Mon Sep 17 00:00:00 2001 From: Stefan Risberg Date: Tue, 19 Dec 2023 00:21:31 +0100 Subject: [PATCH] Version bump and new LTS --- package.yaml | 3 ++- ris-utils.cabal | 5 +++-- stack.yaml | 3 +-- stack.yaml.lock | 17 +++++------------ 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/package.yaml b/package.yaml index eb03de4..99dfba3 100644 --- a/package.yaml +++ b/package.yaml @@ -20,7 +20,7 @@ description: Please see the README at = 4.7 && < 5 -- text == 1.2.* +- text == 2.* - effectful-core >= 2.2.2.0 && < 3 - effectful >= 2.2.2.0 && < 3 - effectful-th == 1.* @@ -28,6 +28,7 @@ dependencies: - torsor == 0.1 - unliftio == 0.2.* - co-log-core == 0.3.* +- bytestring == 0.11.* ghc-options: - -Wall diff --git a/ris-utils.cabal b/ris-utils.cabal index ee1b09d..f709533 100644 --- a/ris-utils.cabal +++ b/ris-utils.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.36.0. -- -- see: https://github.com/sol/hpack @@ -56,12 +56,13 @@ library ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints build-depends: base >=4.7 && <5 + , bytestring ==0.11.* , chronos >=1.1.5 && <2 , co-log-core ==0.3.* , effectful >=2.2.2.0 && <3 , effectful-core >=2.2.2.0 && <3 , effectful-th ==1.* - , text ==1.2.* + , text ==2.* , torsor ==0.1 , unliftio ==0.2.* default-language: Haskell2010 diff --git a/stack.yaml b/stack.yaml index 5c8537e..4dbcf6e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-20.16 +resolver: lts-21.25 # User packages to be built. @@ -36,7 +36,6 @@ packages: # forks / in-progress versions pinned to a git hash. For example: # extra-deps: - - chronos-1.1.5 # - acme-missiles-0.3 # - git: https://github.com/commercialhaskell/stack.git # commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a diff --git a/stack.yaml.lock b/stack.yaml.lock index 33f278d..f823d29 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -3,17 +3,10 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: -- completed: - hackage: chronos-1.1.5@sha256:ca35be5fdbbb384414226b4467c6d1c8b44defe59a9c8a3af32c1c5fb250c781,3830 - pantry-tree: - sha256: 329bf39a05362a9c1f507a4a529725c757208843b562c55e0b7c88538dc3160f - size: 581 - original: - hackage: chronos-1.1.5 +packages: [] snapshots: - completed: - sha256: dad15e2ec0c09280a5c2e07190fb18710fc54472f029f34f861f686540824d81 - size: 649592 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/16.yaml - original: lts-20.16 + sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd + size: 640086 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml + original: lts-21.25