diff --git a/pkgs/top-level/packages-info.nix b/pkgs/top-level/packages-info.nix
index cfa10484822d..12164e90ba84 100644
--- a/pkgs/top-level/packages-info.nix
+++ b/pkgs/top-level/packages-info.nix
@@ -25,9 +25,12 @@ let
                     value = null;
                   }) value.outputs
                 );
-                ${if value ? "pname" then "pname" else null} = value.pname;
                 ${if value ? "system" then "system" else null} = value.system;
-                ${if value ? "version" then "version" else null} = value.version;
+                # TODO: Remove the following two fallbacks when all packages have been fixed.
+                # Note: pname and version are *required* by repology, so do not change to
+                # the optional pattern from above.
+                pname = value.pname or value.name;
+                version = value.version or "";
               };
             }
           ]