Upgrade to Servant 0.19 (#2809)

wireapp · Nov 2, 2022 · a94d00e · a94d00e
1 parent 4da1254
commit a94d00e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 25 deletions.
diff --git a/changelog.d/5-internal/upgrade-servant b/changelog.d/5-internal/upgrade-servant
@@ -0,0 +1 @@
+Upgrade Servant to 0.19
diff --git a/libs/hscim/hscim.cabal b/libs/hscim/hscim.cabal
@@ -106,10 +106,10 @@ library
     , network-uri           >=2.6.2   && <2.7
     , retry                 >=0.8.1.0 && <0.10
     , scientific            >=0.3.6   && <0.4
-    , servant               >=0.16.2  && <0.19
-    , servant-client        >=0.16.2  && <0.19
-    , servant-client-core   >=0.16.2  && <0.19
-    , servant-server        >=0.16.2  && <0.19
+    , servant               >=0.16.2  && <0.20
+    , servant-client        >=0.16.2  && <0.20
+    , servant-client-core   >=0.16.2  && <0.20
+    , servant-server        >=0.16.2  && <0.20
     , stm                   >=2.5.0   && <2.6
     , stm-containers        >=1.1.0   && <1.3
     , string-conversions    >=0.4.0   && <0.5
@@ -172,10 +172,10 @@ executable hscim-server
     , network-uri           >=2.6.2   && <2.7
     , retry                 >=0.8.1.0 && <0.10
     , scientific            >=0.3.6   && <0.4
-    , servant               >=0.16.2  && <0.19
-    , servant-client        >=0.16.2  && <0.19
-    , servant-client-core   >=0.16.2  && <0.19
-    , servant-server        >=0.16.2  && <0.19
+    , servant               >=0.16.2  && <0.20
+    , servant-client        >=0.16.2  && <0.20
+    , servant-client-core   >=0.16.2  && <0.20
+    , servant-server        >=0.16.2  && <0.20
     , stm                   >=2.5.0   && <2.6
     , stm-containers        >=1.1.0   && <1.3
     , string-conversions    >=0.4.0   && <0.5
@@ -257,10 +257,10 @@ test-suite spec
     , network-uri           >=2.6.2   && <2.7
     , retry                 >=0.8.1.0 && <0.10
     , scientific            >=0.3.6   && <0.4
-    , servant               >=0.16.2  && <0.19
-    , servant-client        >=0.16.2  && <0.19
-    , servant-client-core   >=0.16.2  && <0.19
-    , servant-server        >=0.16.2  && <0.19
+    , servant               >=0.16.2  && <0.20
+    , servant-client        >=0.16.2  && <0.20
+    , servant-client-core   >=0.16.2  && <0.20
+    , servant-server        >=0.16.2  && <0.20
     , stm                   >=2.5.0   && <2.6
     , stm-containers        >=1.1.0   && <1.3
     , string-conversions    >=0.4.0   && <0.5

diff --git a/nix/haskell-pins.nix b/nix/haskell-pins.nix
@@ -74,19 +74,6 @@ let
         wai-middleware-prometheus = "wai-middleware-prometheus";
       };
     };
-    servant = {
-      src = fetchgit {
-        url = "https://github.com/haskell-servant/servant.git";
-        rev = "75db4a5327d6d04ae2460bd5ffd008fe16197ba8";
-        sha256 = "0khgk0iqvamph57qp86ilravaw76qnjmg4kpliwfdzfyj9h44w0l";
-      };
-      packages = {
-        servant = "servant";
-        servant-client = "servant-client";
-        servant-client-core = "servant-client-core";
-        servant-server = "servant-server";
-      };
-    };
     hs-collectd = {
       src = fetchgit {
         url = "https://github.com/kim/hs-collectd";