Rename servant-polysemy to servant-client-polysemy where possible

Fix dev shells for local packages

4r/Api/Color.hs

@@ -1,5 +1,5 @@
-{-# OPTIONS_GHC -Wno-orphans #-}
 {-# LANGUAGE Strict #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
 
 module Api.Color (
   GetSections (GetSections)

4r/Main.hs

@@ -3,8 +3,8 @@ module Main (main) where
 import Relude hiding (Proxy)
 
 import Api qualified as Api
-import Api.Types (last_activity_date)
 import Api.Color ()
+import Api.Types (last_activity_date)
 import Cli
 import Color.Print
 import Network.HTTP.Client

flake.nix

@@ -51,7 +51,7 @@
                     relude
                     servant
                     servant-client
-                    servant-polysemy
+                    servant-client-polysemy
                   ];
                   doHaddock = false;
                   doHoogle = false;
@@ -78,7 +78,7 @@
                     relude
                     servant
                     servant-client
-                    servant-polysemy
+                    servant-client-polysemy
                     unordered-containers
                   ];
                   license = nixpkgs.lib.licenses.gpl3Plus;
@@ -91,15 +91,13 @@
                   isExecutable = true;
                   executableHaskellDepends = with pkgs; [
                     _4r-api
-                    ansi-terminal
                     base
                     commonmark
                     commonmark-extensions
                     optparse-applicative
-                    polysemy
                     relude
                     servant
-                    servant-polysemy
+                    servant-server
                   ];
                   license = nixpkgs.lib.licenses.gpl3Plus;
                   passthru = { inherit pkgs; };
@@ -168,8 +166,7 @@
                 "-XTypeSynonymInstances"
                 "-XUndecidableInstances"
               ];
-              default = thisNative._4r.env;
-              ghciIn = dir: default.overrideAttrs (_: {
+              mkGhci = deriv: dir: deriv.env.overrideAttrs (_: {
                 shellHook = ''
                   ghci ${unwords (options ++ extensions)} $(find ${dir} -name '*.hs')
                   exit $?
@@ -177,11 +174,11 @@
               });
            in
           {
-            inherit default;
-            _4r = ghciIn "4r";
-            _4r-api = ghciIn "4r-api";
-            _4r-feed = ghciIn "4r-feed";
-            fourmolu = default.overrideAttrs (a: {
+            default = thisNative._4r.env;
+            _4r = mkGhci thisNative._4r "4r";
+            _4r-api = mkGhci thisNative._4r-api "4r-api";
+            _4r-feed = mkGhci thisNative._4r-feed "4r-feed";
+            fourmolu = thisNative._4r.env.overrideAttrs (a: {
               nativeBuildInputs = a.nativeBuildInputs ++ [ thisNative._4r.passthru.pkgs.fourmolu ];
               shellHook = ''
                 fourmolu --mode inplace \

nix/dependencies.nix

@@ -61,6 +61,26 @@ with builtins; mapAttrs (_: v:
     description = "Automatic derivation of querying functions for servant";
     license = lib.licenses.bsd3;
   }) {};
+  servant-server = final.callPackage ({ lib }: final.mkDerivation {
+    pname = "servant-server";
+    version = "0.19.1";
+    revision = "3";
+    src = "${inputs.servant-src}/servant-server";
+    buildTarget = "servant-server";
+    libraryHaskellDepends = with final; [
+      base base-compat base64-bytestring bytestring constraints
+      containers exceptions filepath http-api-data http-media http-types
+      monad-control mtl network network-uri resourcet servant sop-core
+      string-conversions tagged text transformers transformers-base wai
+      wai-app-static word8
+    ];
+    doCheck = false;
+    doBenchmark = false;
+    doHoogle = false;
+    doHaddock = false;
+    description = "A family of combinators for defining webservices APIs and serving them";
+    license = lib.licenses.bsd3;
+  }) {};
   polysemy-zoo = final.callPackage ({ lib }: final.mkDerivation {
     pname = "polysemy-zoo";
     version = "0.8.0.0";
@@ -138,13 +158,13 @@ with builtins; mapAttrs (_: v:
     description = ''A typechecker plugin that can disambiguate "obvious" uses of effects in polysemy'';
     license = lib.licenses.bsd3;
   }) {};
-  servant-polysemy = final.callPackage ({ lib }: final.mkDerivation {
+  servant-client-polysemy = final.callPackage ({ lib }: final.mkDerivation {
     pname = "servant-polysemy";
     version = "0.1.3";
     src = inputs.servant-polysemy-src;
     patches = [
-      ./patches/servant-polysemy/1.patch
-      ./patches/servant-polysemy/2.patch
+      ./patches/servant-client-polysemy/1.patch
+      ./patches/servant-client-polysemy/2.patch
     ];
     libraryHaskellDepends = with final; [
       base deepseq http-client http-client-tls polysemy