diff --git a/.gitignore b/.gitignore index a047940..1bb5cea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ dist-newstyle/ dist/ +.stack-work/ diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 0000000..de6baeb --- /dev/null +++ b/stack.yaml @@ -0,0 +1,66 @@ +# This file was automatically generated by 'stack init' +# +# Some commonly used options have been documented as comments in this file. +# For advanced use and comprehensive documentation of the format, please see: +# https://docs.haskellstack.org/en/stable/yaml_configuration/ + +# Resolver to choose a 'specific' stackage snapshot or a compiler version. +# A snapshot resolver dictates the compiler version and the set of packages +# to be used for project dependencies. For example: +# +# resolver: lts-3.5 +# resolver: nightly-2015-09-21 +# resolver: ghc-7.10.2 +# resolver: ghcjs-0.1.0_ghc-7.10.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: lts-11.19 + +# User packages to be built. +# Various formats can be used as shown in the example below. +# +# packages: +# - some-directory +# - https://example.com/foo/bar/baz-0.0.2.tar.gz +# - location: +# git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# subdirs: +# - auto-update +# - wai +packages: +- vault-tool +- vault-tool-server +# Dependency packages to be pulled from upstream that are not in the resolver +# using the same syntax as the packages field. +# (e.g., acme-missiles-0.3) +# extra-deps: [] + +# Override default flag values for local packages and extra-deps +# flags: {} + +# Extra package databases containing global packages +# extra-package-dbs: [] + +# Control whether we use the GHC we find on the path +# system-ghc: true +# +# Require a specific version of stack, using version ranges +# require-stack-version: -any # Default +# require-stack-version: ">=1.7" +# +# Override the architecture used by stack, especially useful on Windows +# arch: i386 +# arch: x86_64 +# +# Extra directories used by stack for building +# extra-include-dirs: [/path/to/dir] +# extra-lib-dirs: [/path/to/dir] +# +# Allow a newer minor version of GHC than the snapshot specifies +# compiler-check: newer-minor \ No newline at end of file diff --git a/vault-tool-server/vault-tool-server.cabal b/vault-tool-server/vault-tool-server.cabal index 7e644ba..b565bd8 100644 --- a/vault-tool-server/vault-tool-server.cabal +++ b/vault-tool-server/vault-tool-server.cabal @@ -21,7 +21,7 @@ source-repository head library exposed-modules: Network.VaultTool.VaultServerProcess - build-depends: base >=4.8 && <4.11, + build-depends: base >=4.8 && < 5, vault-tool >=0.1.0.0, aeson, async, diff --git a/vault-tool/vault-tool.cabal b/vault-tool/vault-tool.cabal index 9d85275..c2e101d 100644 --- a/vault-tool/vault-tool.cabal +++ b/vault-tool/vault-tool.cabal @@ -24,7 +24,7 @@ library other-modules: Network.VaultTool.Internal, Network.VaultTool.Types - build-depends: base >=4.8 && <4.11, + build-depends: base >=4.8 && < 5, text, bytestring, http-client,