Unverified Commit c93cd03d authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #297862 from wegank/gcc-10-stdenv-compat 

gcc10StdenvCompat: deprecate
parents 0612c0d5 225e5564

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ mapAliases ({ 
  garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10

  garmin-plugin = throw "garmin-plugin has been removed, as it is unmaintained upstream and no longer works with modern browsers."; # Added 2024-01-12

  garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17

  gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21

  gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11

  geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10

  geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10

pkgs/top-level/all-packages.nix

+1 −4
Original line number Diff line number Diff line
@@ -15712,9 +15712,6 @@ with pkgs; 
  gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12;

  gcc13Stdenv = overrideCC gccStdenv buildPackages.gcc13;













  # Meant for packages that fail with newer than gcc10.













  gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv;



























  # This is not intended for use in nixpkgs but for providing a faster-running















  # compiler to nixpkgs users by building gcc with reproducibility-breaking















  # profile-guided optimizations










@@ -16641,7 +16638,7 @@ with pkgs;













  nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };





























  obliv-c = callPackage ../development/compilers/obliv-c {













    stdenv = gcc10StdenvCompat;













    stdenv = gcc10Stdenv;















    ocamlPackages = ocaml-ng.ocamlPackages_4_14;















  };