[24.05] electron_30-bin: mark as insecure because it's EOL, electron-source.electron_30: remove as it's EOL

pkgs/applications/networking/browsers/chromium/common.nix

@@ -263,21 +263,14 @@ let
       # Chromium reads initial_preferences from its own executable directory
       # This patch modifies it to read /etc/chromium/initial_preferences
       ./patches/chromium-initial-prefs.patch
-    ] ++ lib.optionals (versionRange "120" "126") [
-      # Partial revert to build M120+ with LLVM 17:
       # https://github.com/chromium/chromium/commit/02b6456643700771597c00741937e22068b0f956
       # https://github.com/chromium/chromium/commit/69736ffe943ff996d4a88d15eb30103a8c854e29
-      ./patches/chromium-120-llvm-17.patch
-    ] ++ lib.optionals (chromiumVersionAtLeast "126") [
-      # Rebased variant of patch right above to build M126+ with LLVM 17.
+      # Rebased variant of patch to build M126+ with LLVM 17.
       # staging-next will bump LLVM to 18, so we will be able to drop this soon.
       ./patches/chromium-126-llvm-17.patch
-    ] ++ lib.optionals (versionRange "121" "126") [
-      # M121 is the first version to require the new rust toolchain.
+    ] ++ lib.optionals (versionRange "126" "129") [
       # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61
       # allowing us to use our rustc and our clang.
-      ./patches/chromium-121-rust.patch
-    ] ++ lib.optionals (versionRange "126" "129") [
       # Rebased variant of patch right above to build M126+ with our rust and our clang.
       ./patches/chromium-126-rust.patch
     ] ++ lib.optionals (chromiumVersionAtLeast "129") [

pkgs/development/tools/electron/binary/generic.nix

@@ -43,7 +43,7 @@ let
       ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     # https://www.electronjs.org/docs/latest/tutorial/electron-timelines
-    knownVulnerabilities = optional (versionOlder version "30.0.0") "Electron version ${version} is EOL";
+    knownVulnerabilities = optional (versionOlder version "31.0.0") "Electron version ${version} is EOL";
   };
 
   fetcher = vers: tag: hash: fetchurl {

pkgs/development/tools/electron/common.nix

@@ -49,14 +49,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
 
   src = null;
 
-  patches = base.patches ++ lib.optional (lib.versionOlder info.version "30")
-    (substituteAll {
-      # disable a component that requires CIPD blobs
-      name = "disable-screen-ai.patch";
-      src = ./disable-screen-ai.patch;
-      inherit (info) version;
-    })
-  ;
+  patches = base.patches;
 
   unpackPhase = ''
     runHook preUnpack
@@ -174,9 +167,6 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
     dawn_use_built_dxc = false;
     v8_enable_private_mapping_fork_optimization = true;
     v8_expose_public_symbols = true;
-  } // lib.optionalAttrs (lib.versionOlder info.version "31") {
-    use_perfetto_client_library = false;
-  } // lib.optionalAttrs (lib.versionAtLeast info.version "31") {
     enable_dangling_raw_ptr_feature_flag = false;
     clang_unsafe_buffers_paths = "";
     enterprise_cloud_content_analysis = false;