From 2e53928d19f167dc4955c2014a3e2af67114b0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20G=C3=89RARD?= Date: Sun, 27 May 2018 21:28:08 +0200 Subject: [PATCH] Update websockets library Former-commit-id: 04815d93a8c7e12b2bbeb8d3c6fe55c5cb6af2e0 Former-commit-id: cd37ae36b0fe0b47de29d1d360981136d5f76d24 [formerly b008b9df45b8fcb10ed8be4b80e8c2dc9494ebf5] [formerly 23a42072130b97d8e92ca59d81448f44a5f2c216 [formerly e03828f54cdb79ca12df4423bd9c9dcbc9bf441c [formerly e03828f54cdb79ca12df4423bd9c9dcbc9bf441c [formerly e03828f54cdb79ca12df4423bd9c9dcbc9bf441c [formerly fcb61dbccaeb639d22599a9bf585fe74880dc2c6]]]]] Former-commit-id: bf839c3dc1a3e2d4b56c4cbb772134837f52480a [formerly e9cd21213817c2fa87a09133f52fe8b8d8e5e494] Former-commit-id: a6680fac8ecfcfe8a079049ff5745d18a6e6ed2e Former-commit-id: 133ec29d50da20b3928de5387a898c3c788dfef3 Former-commit-id: 9375011361e0198ff7141526646603fdd81dba77 Former-commit-id: 5d24b611072f677088ea152c91a9d6a450c52d65 [formerly 34da7e99e16e7de318d4a54f06c76f34fa256490] Former-commit-id: 9d0a25506322e55d9c59d1210c0e9fe17239b401 --- Dockerfile | 4 +++- stack.yaml | 18 +++++++----------- wstunnel.cabal | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5eb997d..30fc0d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,9 @@ MAINTAINER github@erebe.eu RUN apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \ ca-certificates git ghc upx curl musl-dev gmp-dev zlib-dev pcre-dev -RUN curl -sSL https://get.haskellstack.org/ | sh +RUN curl -sSL https://github.com/commercialhaskell/stack/releases/download/v1.6.5/stack-1.6.5-linux-x86_64-static.tar.gz | tar xvz && \ + mv stack*/stack /usr/bin + COPY stack.yaml /mnt COPY *.cabal /mnt diff --git a/stack.yaml b/stack.yaml index ca707c7..bcb2b35 100644 --- a/stack.yaml +++ b/stack.yaml @@ -2,7 +2,7 @@ # # Some commonly used options have been documented as comments in this file. # For advanced use and comprehensive documentation of the format, please see: -# http://docs.haskellstack.org/en/stable/yaml_configuration/ +# 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 @@ -27,32 +27,28 @@ resolver: lts-9.9 # git: https://github.com/commercialhaskell/stack.git # commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a # - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true # subdirs: # - auto-update # - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. packages: -- '.' +- . # 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: [] +extra-deps: [ websockets-0.12.4.1 ] # Override default flag values for local packages and extra-deps -flags: {} +# flags: {} # Extra package databases containing global packages -extra-package-dbs: [] +# 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.1" +# require-stack-version: ">=1.7" # # Override the architecture used by stack, especially useful on Windows # arch: i386 diff --git a/wstunnel.cabal b/wstunnel.cabal index b101eb5..6a10251 100644 --- a/wstunnel.cabal +++ b/wstunnel.cabal @@ -31,7 +31,7 @@ library , streaming-commons , text >= 1.2.2.1 , unordered-containers - , websockets + , websockets >= 0.12.4.0 default-language: Haskell2010