about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Heijligen <src@posteo.de>2024-02-19 21:29:43 +0000
committersternenseemann <sternenseemann@systemli.org>2024-02-25 18:19:50 +0100
commit467c84e2c68d3b16b2b70187d9dbbdd565840640 (patch)
tree108e8a06b4159a468321a7a5b37c81ec3a3e4538
parentf2a142727cc0fbc92a9b420567418df9dd36e568 (diff)
gnatPackages: Build all ada-modules with gnat12 and gnat13
Add namespace gnat12Packages and gnat13Packages to get ada-modules build
with a specific gnat version.
For gnatprove this means building the gnat12 and gnat13 version.
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 531f29a4ac0d5..5c01638c2092c 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;