diff --git a/pkgs/by-name/po/postgres-language-server/package.nix b/pkgs/by-name/po/postgres-language-server/package.nix
index 5b6034f8a8c0..f314395e7782 100644
--- a/pkgs/by-name/po/postgres-language-server/package.nix
+++ b/pkgs/by-name/po/postgres-language-server/package.nix
@@ -1,19 +1,21 @@
 {
   lib,
   rustPlatform,
-  fetchgit,
+  fetchFromGitHub,
   rust-jemalloc-sys,
   tree-sitter,
   nodejs,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "postgres-language-server";
-  version = "0.20.0";
+  version = "0.21.0";
 
-  src = fetchgit {
-    url = "https://github.com/supabase-community/postgres-language-server";
+  src = fetchFromGitHub {
+    owner = "supabase-community";
+    repo = "postgres-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-d6h/Igh5DtpMHRFSCVbEooY/mqltXhT91iP4DrOH5SE=";
+    hash = "sha256-E5HRNT4q0RJRJ5PW7uvvrni6jdBZYQCeEWgo0i/fmBQ=";
     fetchSubmodules = true;
   };
 
@@ -41,15 +43,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   cargoBuildFlags = [ "-p=pgls_cli" ];
-  cargoTestFlags = finalAttrs.cargoBuildFlags;
-  checkFlags = [
-    # Tries to write to the file system relatively to the current path
-    "--skip=syntax_error"
-    # Requires a database connection
-    "--skip=test_cli_check_command"
-    "--skip=dblint_detects_issues_snapshot"
-    "--skip=dblint_empty_database_snapshot"
+  # Many tests are integration tests requiring a running Postgres instance
+  doCheck = false;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
   ];
+  doInstallCheck = true;
 
   meta = {
     description = "Tools and language server for Postgres";