diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 2effd687e8e4..db3c8c3339e5 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -146,52 +146,49 @@ let
         "lib"
         "man"
       ];
-      outputChecks =
-        {
-          out = {
-            disallowedReferences = [
-              "dev"
-              "doc"
-              "man"
-            ];
-            disallowedRequisites = [
-              stdenv'.cc
-              llvmPackages.llvm.out
-            ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
-          };
-
-          lib = {
-            disallowedReferences = [
-              "out"
-              "dev"
-              "doc"
-              "man"
-            ];
-            disallowedRequisites = [
-              stdenv'.cc
-              llvmPackages.llvm.out
-            ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
-          };
-        }
-        // lib.optionalAttrs (atLeast "14" && olderThan "15") {
-          # TODO: Make this unconditional via staging because of number of rebuilds.
-          doc = {
-            disallowedReferences = [
-              "out"
-              "dev"
-              "man"
-            ];
-          };
-
-          man = {
-            disallowedReferences = [
-              "out"
-              "dev"
-              "doc"
-            ];
-          };
+      outputChecks = {
+        out = {
+          disallowedReferences = [
+            "dev"
+            "doc"
+            "man"
+          ];
+          disallowedRequisites = [
+            stdenv'.cc
+            llvmPackages.llvm.out
+          ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
         };
 
+        lib = {
+          disallowedReferences = [
+            "out"
+            "dev"
+            "doc"
+            "man"
+          ];
+          disallowedRequisites = [
+            stdenv'.cc
+            llvmPackages.llvm.out
+          ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));
+        };
+
+        doc = {
+          disallowedReferences = [
+            "out"
+            "dev"
+            "man"
+          ];
+        };
+
+        man = {
+          disallowedReferences = [
+            "out"
+            "dev"
+            "doc"
+          ];
+        };
+      };
+
       strictDeps = true;
 
       buildInputs =