diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix index 3a3cecb77620..9a6e728c9fcc 100644 --- a/pkgs/development/compilers/gnat-bootstrap/default.nix +++ b/pkgs/development/compilers/gnat-bootstrap/default.nix @@ -112,6 +112,33 @@ stdenv.mkDerivation ( }; } .${stdenv.hostPlatform.system} or throwUnsupportedSystem; + "16" = { + gccVersion = "16.1.0"; + alireRevision = "1"; + } + // { + x86_64-darwin = { + inherit url; + hash = "sha256-u/cYFKqWLTaFADTscDxnrkYSoemKrfKpNIZ8XPlTbLI="; + upstreamTriplet = "x86_64-apple-darwin24.6.0"; + }; + x86_64-linux = { + inherit url; + hash = "sha256-5bKYPJnXDGa80BtAogLE82X0zTuYKdN2cKh503oMeic="; + upstreamTriplet = "x86_64-pc-linux-gnu"; + }; + aarch64-linux = { + inherit url; + hash = "sha256-jJnqDJGBOjqbT4hDW0nRpV0oA3RXxJhvI7BuvQkPDQI="; + upstreamTriplet = "aarch64-linux-gnu"; + }; + aarch64-darwin = { + inherit url; + hash = "sha256-TJlV/Ngq6SwpIgGkwamTN3aRGP2BnEzJyBGovtWb6Y0="; + upstreamTriplet = "aarch64-apple-darwin24.6.0"; + }; + } + .${stdenv.hostPlatform.system} or throwUnsupportedSystem; }; inherit (versionMap.${majorVersion}) gccVersion alireRevision upstreamTriplet; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac829ad6ab91..2de22e5837ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3562,7 +3562,7 @@ with pkgs; # If we are cross-compiling GNAT, we may as well do the same. gnat-bootstrap = if stdenv.hostPlatform == stdenv.targetPlatform && stdenv.buildPlatform == stdenv.hostPlatform then - buildPackages.gnat-bootstrap15 + buildPackages.gnat-bootstrap16 else buildPackages.gnat16; stdenv = @@ -3571,7 +3571,7 @@ with pkgs; && stdenv.buildPlatform == stdenv.hostPlatform && stdenv.buildPlatform.isDarwin then - overrideCC gccStdenv gnat-bootstrap15 + overrideCC gccStdenv gnat-bootstrap16 else stdenv; } @@ -3593,6 +3593,11 @@ with pkgs; isAlireGNAT = true; }; + gnat-bootstrap16 = wrapCCWith { + cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "16"; }; + isAlireGNAT = true; + }; + gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; }); gnat14Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat14; }); gnat15Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat15; });