diff --git a/manifest.dhall b/manifest.dhall
index 9dbbf1fa5699d158d4b820e8d04bdead40fb6bec..bab4b79f2853f8634b8639ed9ac668571e58a215 100644
--- a/manifest.dhall
+++ b/manifest.dhall
@@ -297,9 +297,15 @@ in  [ callHackage "Cabal" "3.8.1.0"
         "https://github.com/TeofilC/servant"
         (Some "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc")
         (Some "servant-foreign")
+
     , callHackage "servant-lucid" "0.9.0.5"
     , callHackage "servant-multipart" "0.12.1"
     , callHackage "servant-multipart-api" "0.12.1"
+    , callCabal2nix
+        "servant-server"
+        "https://github.com/TeofilC/servant"
+        (Some "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc")
+        (Some "servant-server")
     , callHackage "shake" "0.19.6"
     , callHackage "shelly" "1.10.0"
     , callHackage "singleton-bool" "0.1.6"
diff --git a/overlay.nix b/overlay.nix
index f0d74d3a60472641e4d349de702f9861ec82bdc4..92cc865ab44d864f34086d7538cc11930077a8f6 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -371,6 +371,8 @@ final: prev: with pkgs.haskell.lib; {
 
     servant-multipart-api = prev.callPackage (./pkgs/servant-multipart-api.nix) { };
 
+    servant-server = prev.callPackage (./pkgs/servant-server.nix) { };
+
     shake = prev.callPackage (./pkgs/shake.nix) { };
 
     shelly = prev.callPackage (./pkgs/shelly.nix) { };
diff --git a/pkgs/servant-server.nix b/pkgs/servant-server.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ce1b1603e134ba1342ac2d9531f26157cadec4f0
--- /dev/null
+++ b/pkgs/servant-server.nix
@@ -0,0 +1,47 @@
+{ mkDerivation, aeson, base, base-compat, base64-bytestring
+, bytestring, constraints, containers, directory, exceptions
+, fetchgit, filepath, hspec, hspec-discover, hspec-wai
+, http-api-data, http-media, http-types, lib, monad-control, mtl
+, network, network-uri, QuickCheck, resourcet, safe, servant
+, should-not-typecheck, sop-core, string-conversions, tagged
+, temporary, text, transformers, transformers-base
+, transformers-compat, wai, wai-app-static, wai-extra, warp, word8
+}:
+mkDerivation {
+  pname = "servant-server";
+  version = "0.19.1";
+  src = fetchgit {
+    url = "https://github.com/TeofilC/servant";
+    sha256 = "0f6vkm44p93ln63plk4vfavadcgxjiqr8xncxrjqzp2mcql6qdmh";
+    rev = "76fc90a51f915230bbe1e0d1dbe9727fcdc7a0fc";
+    fetchSubmodules = true;
+  };
+  postUnpack = "sourceRoot+=/servant-server/; echo source root reset to $sourceRoot";
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    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
+  ];
+  executableHaskellDepends = [
+    aeson base base-compat servant text wai warp
+  ];
+  testHaskellDepends = [
+    aeson base base-compat base64-bytestring bytestring directory hspec
+    hspec-wai http-types mtl QuickCheck resourcet safe servant
+    should-not-typecheck sop-core string-conversions temporary text
+    transformers transformers-compat wai wai-extra
+  ];
+  testToolDepends = [ hspec-discover ];
+  doHaddock = false;
+  jailbreak = true;
+  doCheck = false;
+  hyperlinkSource = false;
+  homepage = "http://docs.servant.dev/";
+  description = "A family of combinators for defining webservices APIs and serving them";
+  license = lib.licenses.bsd3;
+  mainProgram = "greet";
+}
\ No newline at end of file