about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2024-03-11 12:34:28 +0100
committerGitHub <noreply@github.com>2024-03-11 12:34:28 +0100
commitb81b8d8e4819bb1714e69879a3f337cd83ed58aa (patch)
treeacd75bfc561a27d177fa76ef7e1c50369406de8f /pkgs/top-level
parent07970054294f84ff36d925275210e0fbaf060376 (diff)
parentb2fc260cabcff7ea451a5449c00c0e5991c389fd (diff)
downloadnixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.tar
nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.tar.gz
nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.tar.bz2
nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.tar.lz
nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.tar.xz
nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.tar.zst
nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.zip
Merge pull request #283142 from wegank/bazel-4-drop
bazel_4: drop
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix12
2 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e9ac017bf1b5..28ee46900ded 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -97,6 +97,7 @@ mapAliases ({
   bashInteractive_5 = bashInteractive; # Added 2021-08-20
   bash_5 = bash; # Added 2021-08-20
   bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02
+  bazel_4 = throw "'bazel_4' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-23
   bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
   bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12
   bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65a5137286f0..c1677d7ddb24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18338,18 +18338,6 @@ with pkgs;
 
   bazel = bazel_6;
 
-  bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 {
-    inherit (darwin) cctools;
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
-    buildJdk = jdk11_headless;
-    buildJdkName = "java11";
-    runJdk = jdk11_headless;
-    stdenv = if stdenv.cc.isClang then llvmPackages.stdenv
-      else if stdenv.cc.isGNU then gcc10Stdenv
-      else stdenv;
-    bazel_self = bazel_4;
-  };
-
   bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 {
     inherit (darwin) cctools sigtool;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;