Merge branch 'main' of https://github.com/flatironinstitute/flathub i…

…nto flatfront-2

Dockerfile

@@ -1,4 +1,4 @@
-FROM fpco/stack-build-small:lts-19.33 AS base
+FROM fpco/stack-build-small:lts-20.26 AS base
 RUN useradd -u 999 -m flathub
 COPY --chown=flathub stack.yaml *.cabal Setup.hs COPYING /home/flathub/flathub/
 WORKDIR /home/flathub/flathub
@@ -28,7 +28,7 @@ RUN apt-key add /tmp/nodesource.gpg.key && \
 EXPOSE 8092
 ENTRYPOINT ["/home/flathub/.local/bin/flathub"]
 CMD []
-ENV LD_LIBRARY_PATH=/home/stackage/.stack/programs/x86_64-linux/ghc-9.0.2/lib/ghc-9.0.2/rts
+ENV LD_LIBRARY_PATH=/home/stackage/.stack/programs/x86_64-linux/ghc-9.2.5/lib/ghc-9.2.5/rts
 USER flathub
 
 COPY --chown=flathub web ./web

src/ES.hs

@@ -56,7 +56,7 @@ import           Data.Typeable (cast)
 import qualified Data.Vector as V
 import qualified Network.HTTP.Client.Conduit as HTTP hiding (httpSource)
 import qualified Network.HTTP.Simple as HTTP
-import           Network.HTTP.Types.Header (hAcceptEncoding, hAccept, hContentType)
+import           Network.HTTP.Types.Header (hAcceptEncoding, hContentType)
 import           Network.HTTP.Types.Method (StdMethod(GET, PUT, POST), renderStdMethod)
 import qualified Network.URI as URI
 import           System.IO (stderr)
@@ -81,7 +81,6 @@ initServer conf = do
   return req
     { HTTP.requestHeaders =
         [ (hAcceptEncoding, " ") -- disable gzip
-        , (hAccept, "application/json")
         ]
     , HTTP.responseTimeout = HTTP.responseTimeoutNone
     }

stack.yaml

@@ -1,12 +1,14 @@
-resolver: lts-19.33
+resolver: lts-20.26
 packages:
 - '.'
 extra-deps:
+  - bzlib-0.5.1.0
   - web-inv-route-0.1.3.2
+  - invertible-0.2.0.8
   - git: https://github.com/dylex/waimwork
     commit: 8ccaa63ac6b80a4ebc9ad7d61ca38cbb009e8f3c
   - git: https://github.com/dylex/hs-hdf5
-    commit: ddc293d6d178553739a3e2f574703203eeb8f326
+    commit: fef08a26f3c8add943beb8463ef7a0cc41245df5
   - git: https://github.com/ondrap/json-stream
     commit: e51d810c8b8bf312da9cb8b81cfd83d0feecc3fa
 flags: