From 5c8739429a287c6068baa238c8b4f2e63f5507a2 Mon Sep 17 00:00:00 2001 From: Steven van den Broek Date: Tue, 16 Feb 2021 17:59:19 +0100 Subject: [PATCH] Update ghc and dependency versions --- package.yaml | 8 ++++---- stack.yaml | 7 +------ stack.yaml.lock | 45 +++++---------------------------------------- 3 files changed, 10 insertions(+), 50 deletions(-) diff --git a/package.yaml b/package.yaml index f46456c..c3458b1 100644 --- a/package.yaml +++ b/package.yaml @@ -21,7 +21,7 @@ description: Hascard is a text-based user interface for reviewing notes dependencies: - base >= 4.7 && < 5 -- brick >= 0.52.1 && < 0.56 +- brick >= 0.52.1 && < 0.60 - containers > 0.6.0 && < 0.7 - directory >= 1.3.3 && < 1.4 - filepath >= 1.4.2 && < 1.5 @@ -30,13 +30,13 @@ dependencies: - mwc-random >= 0.14 && < 0.15 - optparse-applicative >= 0.15.1 && < 0.16 - ordered-containers >= 0.2.2 && < 0.3 -- megaparsec >= 8.0.0 && < 8.1 +- megaparsec >= 8.0.0 && < 10 - process >= 1.6.5 && < 1.7 - random-fu >= 0.2.7 && < 0.3 -- strict >= 0.3.2 && < 0.4 +- strict >= 0.3.2 && < 0.5 - text >= 1.2.3 && < 1.3 - vector >= 0.12.0 && < 0.13 -- vty >= 5.28.2 && < 5.31 +- vty >= 5.28.2 && < 5.33 - word-wrap >= 0.4.1 && < 0.5 - tasty >= 1.2.1 && < 1.3 - tasty-hunit >= 0.10.0 && < 0.11 diff --git a/stack.yaml b/stack.yaml index fa0ea67..aac7bcd 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-16.2 +resolver: lts-17.4 # User packages to be built. # Various formats can be used as shown in the example below. @@ -35,11 +35,6 @@ packages: # forks / in-progress versions pinned to a git hash. For example: # extra-deps: -- random-fu-0.2.7.4 -- random-1.1 -- random-source-0.3.0.8 -- rvar-0.2.0.6@sha256:d07cbb734ec307539fb58d4344b2284a1a91f41c9308f437c27ae8bada2111bf,2317 -- flexible-defaults-0.0.3@sha256:6a7ab000561e1075003cb1053dfbbb4020ae2b02916776d1479c9c3fc82f5d0d,2508 # - acme-missiles-0.3 # - git: https://github.com/commercialhaskell/stack.git # commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a diff --git a/stack.yaml.lock b/stack.yaml.lock index 5c61268..108ab08 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -3,45 +3,10 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: -- completed: - hackage: random-fu-0.2.7.4@sha256:5b5cd338ebbf02ff867691ec27abe481158fb2ae161c3e2e77163434eea0008a,4527 - pantry-tree: - size: 2455 - sha256: b8b0f7e60515305dd2ccb3d8fb03e7efd985addcdf247ac9a522f4bcbe1d1caa - original: - hackage: random-fu-0.2.7.4 -- completed: - hackage: random-1.1@sha256:7b67624fd76ddf97c206de0801dc7e888097e9d572974be9b9ea6551d76965df,1777 - pantry-tree: - size: 637 - sha256: 14a1b01728c5584e87c9fa00746a66e28ffd89dd2c0eabd334c8463953496e1b - original: - hackage: random-1.1 -- completed: - hackage: random-source-0.3.0.8@sha256:db1897e13adb4748d571a8e71fb0c38911ae66ea2557d4def7c30378a0ae2f69,3879 - pantry-tree: - size: 914 - sha256: 3f27fb10fa6f7c78a2256069579ad46c390ed6cc98203ff4240a30ab3065126f - original: - hackage: random-source-0.3.0.8 -- completed: - hackage: rvar-0.2.0.6@sha256:d07cbb734ec307539fb58d4344b2284a1a91f41c9308f437c27ae8bada2111bf,2317 - pantry-tree: - size: 158 - sha256: 48f154bad9ac1cf15c8df874bb903ece2e0d1fe1703e144f31fa32bd776581c0 - original: - hackage: rvar-0.2.0.6@sha256:d07cbb734ec307539fb58d4344b2284a1a91f41c9308f437c27ae8bada2111bf,2317 -- completed: - hackage: flexible-defaults-0.0.3@sha256:6a7ab000561e1075003cb1053dfbbb4020ae2b02916776d1479c9c3fc82f5d0d,2508 - pantry-tree: - size: 497 - sha256: 53d8b98b9e899d63f7e464670e908f6eb22d8a5ba0b6ea48182fb810b426f0f8 - original: - hackage: flexible-defaults-0.0.3@sha256:6a7ab000561e1075003cb1053dfbbb4020ae2b02916776d1479c9c3fc82f5d0d,2508 +packages: [] snapshots: - completed: - size: 531674 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/2.yaml - sha256: 4b08fb9338ca297de7ade8318f4be1216f14dff8c0426c001fb7886ee88cb84a - original: lts-16.2 + size: 563103 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/4.yaml + sha256: f11e2153044f5f71ea7b1c9398f4721f517c9bd37642ed769647b896564021f3 + original: lts-17.4