From a42d18b4e601cfa6ca76a34adb369a40e4a7f10c Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 13 Sep 2024 19:10:19 +0100 Subject: [PATCH] {gcc6,gcc6Stdenv,gfortran6,gcj}: drop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This release branch is 8½ years old and hasn’t received an update in 6 years. Nothing in the Nixpkgs tree uses it. We can simplify a lot of logic in the GCC and cc-wrapper derivations by removing this unsupported version. --- pkgs/by-name/gf/gfortran6/package.nix | 10 ---------- pkgs/top-level/aliases.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 15 +-------------- 3 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 pkgs/by-name/gf/gfortran6/package.nix diff --git a/pkgs/by-name/gf/gfortran6/package.nix b/pkgs/by-name/gf/gfortran6/package.nix deleted file mode 100644 index c6a91e99bf54..000000000000 --- a/pkgs/by-name/gf/gfortran6/package.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ wrapCC, gcc6 }: -wrapCC ( - gcc6.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - } -) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 19bfd3ff3eef..59f337607331 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -510,10 +510,14 @@ 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 - gcc48 = throw "'gcc48' has been removed from nixpkgs"; # Added 2024-09-10 - gcc49 = throw "'gcc49' has been removed from nixpkgs"; # Added 2024-09-11 - gcc49Stdenv = throw "'gcc49Stdenv' has been removed from nixpkgs"; # Added 2024-09-11 + gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10 + gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 + gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 + gcc6 = throw "gcc6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + gcc6Stdenv = throw "gcc6Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21 + gcj = gcj6; # Added 2024-09-13 + gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b24f41323b2..b7ceea009780 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14910,7 +14910,6 @@ with pkgs; extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc; }; - gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6; gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7; gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8; gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9; @@ -15004,7 +15003,7 @@ with pkgs; }; inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; }) - gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14; + gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14; gcc_latest = gcc14; @@ -15018,18 +15017,6 @@ with pkgs; enableLTO = false; }; - gcj = gcj6; - gcj6 = wrapCC (gcc6.cc.override { - name = "gcj"; - langJava = true; - langFortran = false; - langCC = false; - langC = false; - profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext pkg-config perl; - inherit (gnome2) libart_lgpl; - }); - gnat = gnat12; # When changing this, update also gnatPackages gnat11 = wrapCC (gcc11.cc.override {