Bumped Stack resolver to LTS 18 (#2196)

* AppVeyor: Use stack 2.71 * Install libsodium * Travis: Update homebrew * Bumped stack resolver to LTS 18.0 Co-authored-by: Gabriel Gonzalez <[email protected]>
dhall-lang · Jun 26, 2021 · c23e4d5 · c23e4d5
1 parent 04aa88f
commit c23e4d5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,11 @@ branches:
   - master
   - /^\d+\.\d+\.\d+(\.\d+)?$/
 
+addons:
+  homebrew:
+    packages:
+    - libsodium
+    update: true
 
 before_install:
   # Using compiler above sets CC to an invalid value, so unset it

diff --git a/appveyor.yml b/appveyor.yml
@@ -9,7 +9,7 @@ branches:
 
 environment:
   STACK_ROOT: C:\sr
-  STACK_VERSION: 1.9.3
+  STACK_VERSION: 2.7.1
   # Override the temp directory to avoid sed escaping issues
   # See https://github.com/haskell/cabal/issues/5386
   TMP: c:\tmp

diff --git a/stack.yaml b/stack.yaml
@@ -1,42 +1,24 @@
-resolver: lts-14.27
+resolver: lts-18.0
 packages:
   - dhall
   - dhall-bash
+  - dhall-csv
+  - dhall-docs
   - dhall-json
-  - dhall-nix
   - dhall-lsp-server
-  - dhall-yaml
-  - dhall-docs
+  - dhall-nix
   - dhall-openapi
-  - dhall-csv
   - dhall-toml
+  - dhall-yaml
 extra-deps:
-  - aeson-yaml-1.1.0.0
-  - data-fix-0.3.0
-  - generic-random-1.3.0.0@sha256:e5dc3bc7854cfefddc41b562ae78771aaf2e06ea20d7a5c1ecbdb01ba12dd7b7,1346
-  - hashing-0.1.0.1@sha256:98861f16791946cdf28e3c7a6ee9ac8b72d546d6e33c569c7087ef18253294e7,2816
-  - haskeline-0.8.0.0@sha256:0630452b759a5b40e0e3e7ca2ef4b0d55d5161d95e8d7b0dd3cf55888971437f,5440
-  - haskell-lsp-0.22.0.0
-  - haskell-lsp-types-0.22.0.0
-  - hnix-0.10.1
-  - hnix-store-core-0.1.0.0@sha256:719a261870367b3ce2e2e8d11502e7170faa664109a14486b95b555bc3672807,2541
-  - HsYAML-0.2.1.0@sha256:e4677daeba57f7a1e9a709a1f3022fe937336c91513e893166bd1f023f530d68,5311
-  - HsYAML-aeson-0.2.0.0@sha256:04796abfc01cffded83f37a10e6edba4f0c0a15d45bef44fc5bb4313d9c87757,1791
-  - lsp-test-0.10.3.0
-  - monadlist-0.0.2@sha256:978305e3f03dd5f65c673b551124dac0c39a247c2c14d84739ca9a3405fbb63a,904
-  - neat-interpolation-0.5.1.2
-  - parser-combinators-1.2.1@sha256:16c3490e007ec10b1255a2b36fb483d000156d555269107131241d9e0fa96412,1788
-  - path-0.8.0
-  - path-io-1.6.0
-  - prettyprinter-1.7.0
-  - ref-tf-0.4.0.2@sha256:69de3550250e0cd69f45d080359cb314a9487c915024349c75b78732bbee9332,1134
-  - repline-0.4.0.0@sha256:3324479e497d27c40c3d4762bffc52058f9921621d20d2947dcf9a554b94cd0d,2253
-  - semialign-1.1@sha256:5ff1788b6bcec97084ca60f736c126334e4ba4a450517e7ca4f69dd1156d38a0,2471
-  - semialign-indexed-1.1@sha256:bc375898351fea11ab3f4279844fcfc00aa42c90182eedfc28c4754098da3e0e,2026
-  - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
-  - tasty-silver-3.1.15@sha256:f40b3f59dfabe14f185b5d27fdb8aa8b7c75458aa7999f8aa244b9dcbaf8dc31,2328
-  - tomland-1.3.2.0
-  - validation-selective-0.1.0.1@sha256:9a5aa8b801efc6a4ffb120e1b28e80c5f7d090043be56bba11222cd20c393044,3621
+  - haskell-lsp-0.23.0.0@sha256:b782cb24ca62510f4eb698f778f7e6dac6419a5ac8fb8dc67bdffe4ae04ae42d,5315
+  - haskell-lsp-types-0.23.0.0@sha256:b15d9c2aff8b8145797f5fa6771910b986d2456eccb30c3de69b75d4768cd12d,3027
+  - hnix-0.13.1@sha256:50748fdddbdb2dc04c2d0b71fe708cde3c50258291c5db8839f76c85d9fdb505,21066
+  - hnix-store-core-0.4.3.0@sha256:82397e5afb9b095626fd72e92d0ae42df02b2107df2de275d99e9968fa41ed65,2766
+  - hnix-store-remote-0.4.3.1@sha256:1ec3ce04cbe381b4dcba736f10b1bf30812533cffc1e7997571ee0d377f1df78,2263
+  - lsp-test-0.12.0.0@sha256:9175c2b2e19340880f10c407fef11a4d11dd6261387e8086774bbc7b7fcf2d4f,4376
+  - relude-1.0.0.1@sha256:35bcdaf14018e79f11e712b0e2314c1aac79976f28f4adc179985457493557d5,11569
+  - semialign-1.2@sha256:9afb6eb7e50db7ca34d7c4108aec0f643dae2caaaa80394b44ffdd643315685c,2721
 nix:
   packages:
     - ncurses