From 467c84e2c68d3b16b2b70187d9dbbdd565840640 Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Mon, 19 Feb 2024 21:29:43 +0000 Subject: [PATCH] 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. --- pkgs/top-level/all-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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;