ehmry/dhall-haskell
ehmry
/
dhall-haskell
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump up lower bound of aeson-pretty (#978)

This commit is contained in:
Javier Neira 2019-06-01 16:10:38 +02:00 committed by Gabriel Gonzalez
parent 7410f8d3bd
commit 2a37b2e7bf
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
appveyor.yml
View File

@ -39,7 +39,6 @@ for:
-
matrix:
except:
# dhall-json is not supported for LTS 6
- STACK_YAML: stack-lts-6.yaml
build_script:
@ -51,10 +50,10 @@ for:
- 7z a "bin\dhall-json-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-json.exe"
- 7z a "bin\dhall-json-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-yaml.exe"
- 7z a "bin\dhall-json-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\json-to-dhall.exe"
- 7z a "bin\dhall-json-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\yaml-to-dhall.exe"
- 7z a "bin\dhall-text-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-text.exe"
- 7z a "bin\dhall-bash-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-bash.exe"
# dhall-lsp-server can't be built with lts-6
- if exist "%APPVEYOR_BUILD_FOLDER%\bin\dhall-lsp-server.exe" ( 7z a "bin\dhall-lsp-server-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-lsp-server.exe" )
- 7z a "bin\dhall-lsp-server-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-lsp-server.exe"
-
matrix:
only:
@ -65,13 +64,11 @@ for:
- stack install --local-bin-path bin
- if /I "%APPVEYOR_REPO_TAG%" EQU "true" (set DEPLOY_TAG=%APPVEYOR_REPO_TAG_NAME%) else (set DEPLOY_TAG=%APPVEYOR_REPO_COMMIT:~0,5%)
- set DEPLOY_SUFFIX=%DEPLOY_TAG%-x86_64-windows.zip
# dhall-json is not supported for LTS 6, so do not try to copy the
# dhall-json and dhall-lsp-server is not supported for LTS 6, so do not try to copy the
# corresponding binaries
- 7z a "bin\dhall-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall.exe"
- 7z a "bin\dhall-text-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-text.exe"
- 7z a "bin\dhall-bash-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-to-bash.exe"
# dhall-lsp-server can't be built with lts-6
- if exist "%APPVEYOR_BUILD_FOLDER%\bin\dhall-lsp-server.exe" ( 7z a "bin\dhall-lsp-server-%DEPLOY_SUFFIX%" "%APPVEYOR_BUILD_FOLDER%\bin\dhall-lsp-server.exe" )
-
matrix:

2
dhall-json/dhall-json.cabal
View File

@ -69,7 +69,7 @@ Executable dhall-to-json
Build-Depends:
base ,
aeson ,
aeson-pretty < 0.9 ,
aeson-pretty >= 0.8.5 && < 0.9 ,
bytestring < 0.11,
dhall ,
dhall-json ,

3
stack.yaml
View File

@ -1,4 +1,4 @@
resolver: lts-13.16
resolver: lts-13.19
packages:
- dhall
- dhall-bash
@ -7,7 +7,6 @@ packages:
- dhall-lsp-server
extra-deps:
- repline-0.2.1.0
- yaml-0.10.4.0
nix:
packages:
- ncurses