From 651a4a06c3f46efc97f2c571c3659d8c22cfa3e2 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Thu, 4 Jan 2024 16:03:50 +0100 Subject: [PATCH] remove urlencoded and wai-handler-hal overrides --- Dockerfile | 2 +- cabal.project | 11 ----------- stack.yaml | 2 +- stack.yaml.lock | 8 ++++---- zureg.cabal | 4 ++-- 5 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 cabal.project diff --git a/Dockerfile b/Dockerfile index 2f4ff3c..e2add53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN ghcup install cabal 3.2.0.0 ENV PATH="/root/.ghcup/bin:${PATH}" RUN cabal update -COPY zureg.cabal cabal.project /work/ +COPY zureg.cabal /work/ WORKDIR /work RUN cabal build --only-dependencies \ --ghc-options='-split-sections -optl-static' diff --git a/cabal.project b/cabal.project deleted file mode 100644 index 5ba87ea..0000000 --- a/cabal.project +++ /dev/null @@ -1,11 +0,0 @@ -packages: . - -source-repository-package - type: git - location: https://github.com/jaspervdj/urlencoded.git - tag: 79e31ed9279c820bb89e36824464fdfb4b7b968a - -source-repository-package - type: git - location: https://github.com/jaspervdj/wai-handler-hal.git - tag: 999114f42a7a36e1486c3f723377b50a2e88c11d diff --git a/stack.yaml b/stack.yaml index 8c53226..9ecdf0b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -9,7 +9,7 @@ extra-deps: - 'hal-1.0.0.1' - 'unliftio-core-0.1.2.0' - 'urlencoded-0.5.0.0' -- 'wai-handler-hal-0.2.0.0' +- 'wai-handler-hal-0.3.0.0' nix: packages: - 'zlib' diff --git a/stack.yaml.lock b/stack.yaml.lock index ef52e9f..cfdaf9f 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -54,12 +54,12 @@ packages: original: hackage: urlencoded-0.5.0.0 - completed: - hackage: wai-handler-hal-0.2.0.0@sha256:ef98b78c3beb05eecc9239775dd010308ed7a75b76a0db8471d4466a76b450f8,2954 + hackage: wai-handler-hal-0.3.0.0@sha256:7a0510f868b332bc14baf097c802979e0ae8ed5c999d359e42a6417afdccff55,2900 pantry-tree: - size: 592 - sha256: e500f789cb7b0dab089768a512e7703ad93407a73635a3cf1aa1081233c04ba5 + size: 594 + sha256: 26e9c89686d0e7f60e92e8bd6fc20138fa362a8ec9c4f28c3f58a0a6e49555ec original: - hackage: wai-handler-hal-0.2.0.0 + hackage: wai-handler-hal-0.3.0.0 snapshots: - completed: size: 586286 diff --git a/zureg.cabal b/zureg.cabal index 51fa356..d95c9fb 100644 --- a/zureg.cabal +++ b/zureg.cabal @@ -105,7 +105,7 @@ Library text >= 1.2 && < 1.3, time >= 1.8 && < 1.10, unordered-containers >= 0.2 && < 0.3, - urlencoded >= 0.4 && < 0.6, + urlencoded >= 0.5 && < 0.6, uuid >= 1.3 && < 1.4, vector >= 0.12 && < 1.13, wai >= 3.2 && < 3.3, @@ -153,4 +153,4 @@ Executable zureg-lambda Main-is: Lambda.hs Build-depends: hal >= 1.0 && < 1.1, - wai-handler-hal >= 0.2 && < 0.3 + wai-handler-hal >= 0.3 && < 0.4