pyrox.dev / nixpkgs
lol
fork atom

gnat{13,14}: bootstrap with gnat-bootstrap{13,14} (#361939)

authored by Weijia Wang and committed by GitHub 089d44b6 00412288

+53 -5
unified split
+39 -1
pkgs/development/compilers/gnat-bootstrap/default.nix
··· 1 - { stdenv, lib, autoPatchelfHook, fetchzip, xz, ncurses5, readline, gmp, mpfr 1 + { stdenv, lib, autoPatchelfHook, fetchzip, xz, ncurses5, ncurses, readline, gmp, mpfr 2 2 , expat, libipt, zlib, dejagnu, sourceHighlight, python3, elfutils, guile, glibc 3 3 , majorVersion 4 4 }: ··· 40 40 upstreamTriplet = "x86_64-pc-linux-gnu"; 41 41 }; 42 42 }.${stdenv.hostPlatform.system} or throwUnsupportedSystem; 43 + "13" = { 44 + gccVersion = "13.2.0"; 45 + alireRevision = "2"; 46 + } // { 47 + x86_64-darwin = { 48 + inherit url; 49 + hash = "sha256-DNHcHTIi7pw0rsVtpyGTyLVElq3IoO2YX/OkDbdeQyo="; 50 + upstreamTriplet = "x86_64-apple-darwin21.6.0"; 51 + }; 52 + x86_64-linux = { 53 + inherit url; 54 + hash = "sha256-DC95udGSzRDE22ON4UpekxTYWOSBeUdJvILbSFj6MFQ="; 55 + upstreamTriplet = "x86_64-pc-linux-gnu"; 56 + }; 57 + }.${stdenv.hostPlatform.system} or throwUnsupportedSystem; 58 + "14" = { 59 + gccVersion = "14.2.0"; 60 + alireRevision = "1"; 61 + } // { 62 + x86_64-darwin = { 63 + inherit url; 64 + hash = "sha256-3YOnvuI6Qq7huQcqgFSz/o+ZgY2wNkKDqHIuzNz1MVY="; 65 + upstreamTriplet = "x86_64-apple-darwin21.6.0"; 66 + }; 67 + x86_64-linux = { 68 + inherit url; 69 + hash = "sha256-pH3IuOpCM9sY/ppTYcxBmgpsUiMrisIjmAa/rmmZXb4="; 70 + upstreamTriplet = "x86_64-pc-linux-gnu"; 71 + }; 72 + }.${stdenv.hostPlatform.system} or throwUnsupportedSystem; 43 73 }; 44 74 inherit (versionMap.${majorVersion}) gccVersion alireRevision upstreamTriplet; 45 75 in { ··· 71 101 72 102 buildInputs = [ 73 103 expat 104 + ] ++ lib.optionals (lib.versionAtLeast majorVersion "13") [ 105 + ncurses 106 + ] ++ lib.optionals (lib.versionOlder majorVersion "13") [ 74 107 ncurses5 108 + ] ++ [ 75 109 xz 76 110 ]; 77 111 78 112 strictDeps = true; 113 + 114 + # https://github.com/alire-project/GNAT-FSF-builds/issues/51 115 + autoPatchelfIgnoreMissingDeps = 116 + if (stdenv.buildPlatform.isLinux && majorVersion == "13") then true else null; 79 117 80 118 postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin) '' 81 119 substituteInPlace lib/gcc/${upstreamTriplet}/${gccVersion}/install-tools/mkheaders.conf \
+14 -4
pkgs/top-level/all-packages.nix
··· 5940 5940 gnat-bootstrap = 5941 5941 if stdenv.hostPlatform == stdenv.targetPlatform 5942 5942 && stdenv.buildPlatform == stdenv.hostPlatform 5943 - then buildPackages.gnat-bootstrap12 5943 + then buildPackages.gnat-bootstrap13 5944 5944 else buildPackages.gnat13; 5945 5945 stdenv = 5946 5946 if stdenv.hostPlatform == stdenv.targetPlatform 5947 5947 && stdenv.buildPlatform == stdenv.hostPlatform 5948 5948 && stdenv.buildPlatform.isDarwin 5949 5949 && stdenv.buildPlatform.isx86_64 5950 - then overrideCC stdenv gnat-bootstrap12 5950 + then overrideCC stdenv gnat-bootstrap13 5951 5951 else stdenv; 5952 5952 }); 5953 5953 ··· 5963 5963 gnat-bootstrap = 5964 5964 if stdenv.hostPlatform == stdenv.targetPlatform 5965 5965 && stdenv.buildPlatform == stdenv.hostPlatform 5966 - then buildPackages.gnat-bootstrap12 5966 + then buildPackages.gnat-bootstrap14 5967 5967 else buildPackages.gnat13; 5968 5968 stdenv = 5969 5969 if stdenv.hostPlatform == stdenv.targetPlatform 5970 5970 && stdenv.buildPlatform == stdenv.hostPlatform 5971 5971 && stdenv.buildPlatform.isDarwin 5972 5972 && stdenv.buildPlatform.isx86_64 5973 - then overrideCC stdenv gnat-bootstrap12 5973 + then overrideCC stdenv gnat-bootstrap14 5974 5974 else stdenv; 5975 5975 }); 5976 5976 ··· 5978 5978 gnat-bootstrap11 = wrapCC (callPackage ../development/compilers/gnat-bootstrap { majorVersion = "11"; }); 5979 5979 gnat-bootstrap12 = wrapCCWith ({ 5980 5980 cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "12"; }; 5981 + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) { 5982 + bintools = bintoolsDualAs; 5983 + }); 5984 + gnat-bootstrap13 = wrapCCWith ({ 5985 + cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "13"; }; 5986 + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) { 5987 + bintools = bintoolsDualAs; 5988 + }); 5989 + gnat-bootstrap14 = wrapCCWith ({ 5990 + cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "14"; }; 5981 5991 } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) { 5982 5992 bintools = bintoolsDualAs; 5983 5993 });