From b34210b7391ed43bc678dcb208ebe766b0827fb3 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Wed, 9 Dec 2020 21:30:27 -0500 Subject: [PATCH] Update Stack configurations --- .travis.yml | 4 ++++ Makefile | 7 ++++++- stack-8.6.5.yaml | 6 +----- stack-8.6.5.yaml.lock | 24 +++++------------------ stack-8.8.4.yaml | 1 + stack-8.8.4.yaml.lock | 12 ++++++++++++ stack.yaml | 11 ++--------- stack.yaml.lock | 44 ++++++++----------------------------------- 8 files changed, 39 insertions(+), 70 deletions(-) create mode 100644 stack-8.8.4.yaml create mode 100644 stack-8.8.4.yaml.lock diff --git a/.travis.yml b/.travis.yml index 19a5ca9..6b223bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,6 +69,10 @@ matrix: compiler: ": #stack default" addons: {apt: {packages: [libgmp-dev]}} + - env: BUILD=stack ARGS="--stack-yaml stack-8.8.4.yaml" + compiler: ": #stack 8.8.4" + addons: {apt: {packages: [libgmp-dev]}} + - env: BUILD=stack ARGS="--stack-yaml stack-8.6.5.yaml" compiler: ": #stack 8.6.5" addons: {apt: {packages: [libgmp-dev]}} diff --git a/Makefile b/Makefile index ca0a962..2d5b809 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,12 @@ test: .PHONY: test-all test-all: - $(MAKE) test test-8.6.5 + $(MAKE) test test-8.8.4 test-8.6.5 + +.PHONY: test-8.8.4 +test-8.8.4: + echo "test 8.8.4" + stack test --stack-yaml stack-8.8.4.yaml --work-dir .stack-work-8.8.4 .PHONY: test-8.6.5 test-8.6.5: diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 2717de3..785b146 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -1,5 +1 @@ -resolver: lts-13.23 - -extra-deps: - - butcher-1.3.2.1 - - multistate-0.8.0.1 +resolver: lts-14.27 diff --git a/stack-8.6.5.yaml.lock b/stack-8.6.5.yaml.lock index a7d341f..e24dcac 100644 --- a/stack-8.6.5.yaml.lock +++ b/stack-8.6.5.yaml.lock @@ -3,24 +3,10 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: -- completed: - hackage: butcher-1.3.2.1@sha256:cf479ea83a08f4f59a482e7c023c70714e7c93c1ccd7d53fe076ad3f1a3d2b8d,3115 - pantry-tree: - size: 1197 - sha256: dc4bd6adc5f8bd3589533659b62567da78b6956d7098e561c0523c60fcaa0406 - original: - hackage: butcher-1.3.2.1 -- completed: - hackage: multistate-0.8.0.1@sha256:496ac087a0df3984045d7460b981d5e868a49e160b60a6555f6799e81e58542d,3700 - pantry-tree: - size: 2143 - sha256: 0136d5fcddee0244c3bc73b4ae1b489134a1dd12a8978f437b2be81e98f5d8bd - original: - hackage: multistate-0.8.0.1 +packages: [] snapshots: - completed: - size: 498398 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/13/23.yaml - sha256: 63151ca76f39d5cfbd266ce019236459fdda53fbefd2200aedeb33bcc81f808e - original: lts-13.23 + size: 524996 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/27.yaml + sha256: 7ea31a280c56bf36ff591a7397cc384d0dff622e7f9e4225b47d8980f019a0f0 + original: lts-14.27 diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml new file mode 100644 index 0000000..d014f95 --- /dev/null +++ b/stack-8.8.4.yaml @@ -0,0 +1 @@ +resolver: lts-16.25 diff --git a/stack-8.8.4.yaml.lock b/stack-8.8.4.yaml.lock new file mode 100644 index 0000000..31befa1 --- /dev/null +++ b/stack-8.8.4.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + size: 533252 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/25.yaml + sha256: 147598b98bdd95ec0409bac125a4f1bff3cd4f8d73334d283d098f66a4bcc053 + original: lts-16.25 diff --git a/stack.yaml b/stack.yaml index 7ff28c9..9989a09 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,11 +1,4 @@ -resolver: lts-13.25 +resolver: nightly-2020-12-09 extra-deps: - - multistate-0.8.0.2 - - butcher-1.3.2.3 - - deque-0.4.2.3 - - strict-list-0.1.4 - - ghc-exactprint-0.6.2 - -packages: - - . + - data-tree-print-0.1.0.2 diff --git a/stack.yaml.lock b/stack.yaml.lock index 6a1ae68..91c9355 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,43 +5,15 @@ packages: - completed: - hackage: multistate-0.8.0.2@sha256:fbb0d8ade9ef73c8ed92488f5804d0ebe75d3a9c24bf53452bc3a4f32b34cb2e,3713 + hackage: data-tree-print-0.1.0.2@sha256:d845e99f322df70e0c06d6743bf80336f5918d5423498528beb0593a2afc1703,1620 pantry-tree: - size: 2143 - sha256: 1753828d37b456e1e0241766d893b29f385ef7769fa79610f507b747935b77cb + size: 272 + sha256: b8778eb1b16fddb91b2eed2b25f33a89d1e4f7a533160de4ccbf226f82456135 original: - hackage: multistate-0.8.0.2 -- completed: - hackage: butcher-1.3.2.3@sha256:1b8040eddb6da2a05426bf9f6c56b078e629228d64d7d61fb3daa88802487e1b,3262 - pantry-tree: - size: 1197 - sha256: 6bf3a318bd8689bd1fa7a8084c0d96372768d2dc3e30d9aa58d07741ed6816e6 - original: - hackage: butcher-1.3.2.3 -- completed: - hackage: deque-0.4.2.3@sha256:7cc8ddfc77df351ff9c16e838ccdb4a89f055c80a3111e27eba8d90e8edde7d0,1853 - pantry-tree: - size: 807 - sha256: 7f584c71e9e912935f829cb4667411ae3c3048fcd8b935170fb5a45188019403 - original: - hackage: deque-0.4.2.3 -- completed: - hackage: strict-list-0.1.4@sha256:0fa869e2c21b710b7133e8628169f120fe6299342628edd3d5087ded299bc941,1631 - pantry-tree: - size: 340 - sha256: bbb22fd014867dc48697ddd8598d4a9fb03fa2d58ef79bed94f208a9b6d94224 - original: - hackage: strict-list-0.1.4 -- completed: - hackage: ghc-exactprint-0.6.2@sha256:d822f64351e9a8e03d9bad35c8fdf558d30dc396801b396c52b5d5bffaee9108,8368 - pantry-tree: - size: 85384 - sha256: d904de9c01e58bfa091d7caa09e0423e9d2932b7b3490c4d83140731f4473877 - original: - hackage: ghc-exactprint-0.6.2 + hackage: data-tree-print-0.1.0.2 snapshots: - completed: - size: 499461 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/13/25.yaml - sha256: aed98969628e20615e96b06083c933c7e3354ae56b08b75e607a26569225d6c0 - original: lts-13.25 + size: 556768 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2020/12/9.yaml + sha256: bca31ebf05f842be9dd24410eca84f296da1860369a82eb7466f447a76cca762 + original: nightly-2020-12-09