From 0d04a2d91ca79827257f8107753793f46f56016c Mon Sep 17 00:00:00 2001 From: Arya Irani Date: Wed, 15 Jun 2022 16:02:25 -0400 Subject: [PATCH] update to ghc-9.2.3 --- stack.yaml | 6 ++++-- stack.yaml.lock | 26 +++++++++++++++----------- unison-core/package.yaml | 1 - unison-core/unison-core1.cabal | 1 - 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/stack.yaml b/stack.yaml index da7c4c57e7..9d3622c036 100644 --- a/stack.yaml +++ b/stack.yaml @@ -29,19 +29,21 @@ packages: - lib/unison-pretty-printer #compiler-check: match-exact -resolver: lts-18.28 +resolver: nightly-2022-06-15 extra-deps: - github: unisonweb/configurator commit: e47e9e9fe1f576f8c835183b9def52d73c01327a - github: unisonweb/shellmet commit: 2fd348592c8f51bb4c0ca6ba4bc8e38668913746 +# monad-validate patch to support ghc 9 https://github.com/hasura/monad-validate/pull/5 +- github: unisonweb/monad-validate + commit: 5b181b7c57d6e2c975c533b0a0072e9aeb15fb99 - guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078 - prelude-extras-0.4.0.3@sha256:1c10b0123ea13a6423d74a8fcbaeb2d5249b472588abde418a36b47b7c4f48c8,1163 - sandi-0.5@sha256:b278d072ca717706ea38f9bd646e023f7f2576a778fb43565b434f93638849aa,3010 - strings-1.1@sha256:0285dec4c8ab262359342b3e5ef1eb567074669461b9b38404f1cb870c881c5c,1617 - fuzzyfind-3.0.0@sha256:d79a5d3ed194dd436c6b839bf187211d880cf773b2febaca456e5ccf93f5ac65,1814 -- monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505 - NanoID-3.1.0@sha256:9118ab00e8650b5a56a10c90295d357eb77a8057a598b7e56dfedc9c6d53c77d,1524 # not in lts-18.13 - recover-rtti-0.4.0.0@sha256:2ce1e031ec0e34d736fa45f0149bbd55026f614939dc90ffd14a9c5d24093ff4,4423 diff --git a/stack.yaml.lock b/stack.yaml.lock index bd03b27218..f1cffdb5d9 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -26,6 +26,17 @@ packages: sha256: 05a169a7a6b68100630e885054dc1821d31cd06571b0317ec90c75ac2c41aeb7 original: url: https://github.com/unisonweb/shellmet/archive/2fd348592c8f51bb4c0ca6ba4bc8e38668913746.tar.gz +- completed: + size: 18146 + url: https://github.com/unisonweb/monad-validate/archive/5b181b7c57d6e2c975c533b0a0072e9aeb15fb99.tar.gz + name: monad-validate + version: 1.2.0.0 + sha256: 3cf178595f6dee0cbf73d1263327b38f69df1e9ae406429e4252be634fa88f1e + pantry-tree: + size: 869 + sha256: 2520040223ec05c14da5f1d2ac7a38e5ed2caf0ec307bce4566924da54c28166 + original: + url: https://github.com/unisonweb/monad-validate/archive/5b181b7c57d6e2c975c533b0a0072e9aeb15fb99.tar.gz - completed: hackage: guid-0.1.0@sha256:a7c975be473f6f142d5cc1b39bc807a99043d20b1bb0873fdfe7a3ce84d2faf1,1078 pantry-tree: @@ -61,13 +72,6 @@ packages: sha256: 0e6c6d4f89083c8385de5adc4f36ad01b2b0ff45261b47f7d90d919969c8b5ed original: hackage: fuzzyfind-3.0.0@sha256:d79a5d3ed194dd436c6b839bf187211d880cf773b2febaca456e5ccf93f5ac65,1814 -- completed: - hackage: monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505 - pantry-tree: - size: 713 - sha256: 8e049bd12ce2bd470909578f2ee8eb80b89d5ff88860afa30e29dd4eafecfa3e - original: - hackage: monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505 - completed: hackage: NanoID-3.1.0@sha256:9118ab00e8650b5a56a10c90295d357eb77a8057a598b7e56dfedc9c6d53c77d,1524 pantry-tree: @@ -98,7 +102,7 @@ packages: hackage: http-client-0.7.11 snapshots: - completed: - size: 590100 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/28.yaml - sha256: 428ec8d5ce932190d3cbe266b9eb3c175cd81e984babf876b64019e2cbe4ea68 - original: lts-18.28 + size: 611629 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/6/15.yaml + sha256: e6aa206ca389d8ad5b07d48cc54ca4787e27ed9dde90b0edf8875e6caec16bd2 + original: nightly-2022-06-15 diff --git a/unison-core/package.yaml b/unison-core/package.yaml index bd59e25667..1c1e604238 100644 --- a/unison-core/package.yaml +++ b/unison-core/package.yaml @@ -29,7 +29,6 @@ library: - unison-prelude - unison-util - unison-util-relation - - util - vector default-extensions: diff --git a/unison-core/unison-core1.cabal b/unison-core/unison-core1.cabal index 0281f19dae..c3e7d6f687 100644 --- a/unison-core/unison-core1.cabal +++ b/unison-core/unison-core1.cabal @@ -104,7 +104,6 @@ library , unison-prelude , unison-util , unison-util-relation - , util , vector if flag(optimized) ghc-options: -O2 -funbox-strict-fields