diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 531f29a4ac0d..5c01638c2092 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16003,7 +16003,7 @@ with pkgs;
     inherit (gnome2) libart_lgpl;
   });
 
-  gnat = gnat12;
+  gnat = gnat12; # When changing this, update also gnatPackages
 
   gnat11 = wrapCC (gcc11.cc.override {
     name = "gnat";
@@ -16075,7 +16075,10 @@ with pkgs;
     bintools = bintoolsDualAs;
   });
 
-  gnatPackages   = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat; });
+  gnat12Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat12; });
+  gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; });
+  gnatPackages   = gnat12Packages;
+
   inherit (gnatPackages)
     gprbuild
     gnatprove;