[Backport release-24.11] electron_32-bin: mark as insecure because it's EOL, electron-source.electron_32: remove as it's EOL

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

@@ -477,18 +477,11 @@ let
         # 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 "126" "129") [
         # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61
         # allowing us to use our rustc and our clang.
-        # Rebased variant of patch right above to build M126+ with our rust and our clang.
-        ./patches/chromium-126-rust.patch
-      ]
-      ++ lib.optionals (chromiumVersionAtLeast "129") [
-        # Rebased variant of patch right above to build M129+ with our rust and our clang.
         ./patches/chromium-129-rust.patch
       ]
-      ++ lib.optionals (chromiumVersionAtLeast "130" && !ungoogled) [
+      ++ lib.optionals (!ungoogled) [
         # Our rustc.llvmPackages is too old for std::hardware_destructive_interference_size
         # and std::hardware_constructive_interference_size.
         # So let's revert the change for now and hope that our rustc.llvmPackages and

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

@@ -82,27 +82,23 @@ let
           pulseSupport
           ungoogled
           ;
-        gnChromium = buildPackages.gn.overrideAttrs (
-          oldAttrs:
-          {
-            version = if (upstream-info.deps.gn ? "version") then upstream-info.deps.gn.version else "0";
-            src = fetchgit {
-              url = "https://gn.googlesource.com/gn";
-              inherit (upstream-info.deps.gn) rev hash;
-            };
-
-            # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with:
-            # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
-            hardeningDisable = [ "format" ];
-          }
-          // lib.optionalAttrs (chromiumVersionAtLeast "130") {
-            # At the time of writing, gn is at v2024-05-13 and has a backported patch.
-            # This patch appears to be already present in v2024-09-09 (from M130), which
-            # results in the patch not applying and thus failing the build.
-            # As a work around until gn is updated again, we filter specifically that patch out.
-            patches = lib.filter (e: lib.getName e != "LFS64.patch") oldAttrs.patches;
-          }
-        );
+        gnChromium = buildPackages.gn.overrideAttrs (oldAttrs: {
+          version = if (upstream-info.deps.gn ? "version") then upstream-info.deps.gn.version else "0";
+          src = fetchgit {
+            url = "https://gn.googlesource.com/gn";
+            inherit (upstream-info.deps.gn) rev hash;
+          };
+
+          # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with:
+          # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]
+          hardeningDisable = [ "format" ];
+
+          # At the time of writing, gn is at v2024-05-13 and has a backported patch.
+          # This patch appears to be already present in v2024-09-09 (from M130), which
+          # results in the patch not applying and thus failing the build.
+          # As a work around until gn is updated again, we filter specifically that patch out.
+          patches = lib.filter (e: lib.getName e != "LFS64.patch") oldAttrs.patches;
+        });
       }
       // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "132") {
         buildPackages = buildPackages // {

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

@@ -56,7 +56,7 @@ let
     ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     # https://www.electronjs.org/docs/latest/tutorial/electron-timelines
-    knownVulnerabilities = optional (versionOlder version "32.0.0") "Electron version ${version} is EOL";
+    knownVulnerabilities = optional (versionOlder version "33.0.0") "Electron version ${version} is EOL";
   };
 
   fetcher =

pkgs/development/tools/electron/common.nix

@@ -173,51 +173,46 @@ in
     ''
     + (base.preConfigure or "");
 
-  gnFlags =
-    rec {
-      # build/args/release.gn
-      is_component_build = false;
-      is_official_build = true;
-      rtc_use_h264 = proprietary_codecs;
-      is_component_ffmpeg = true;
+  gnFlags = rec {
+    # build/args/release.gn
+    is_component_build = false;
+    is_official_build = true;
+    rtc_use_h264 = proprietary_codecs;
+    is_component_ffmpeg = true;
 
-      # build/args/all.gn
-      is_electron_build = true;
-      root_extra_deps = [ "//electron" ];
-      node_module_version = info.modules;
-      v8_promise_internal_field_count = 1;
-      v8_embedder_string = "-electron.0";
-      v8_enable_snapshot_native_code_counters = false;
-      v8_enable_javascript_promise_hooks = true;
-      enable_cdm_host_verification = false;
-      proprietary_codecs = true;
-      ffmpeg_branding = "Chrome";
-      enable_printing = true;
-      angle_enable_vulkan_validation_layers = false;
-      dawn_enable_vulkan_validation_layers = false;
-      enable_pseudolocales = false;
-      allow_runtime_configurable_key_storage = true;
-      enable_cet_shadow_stack = false;
-      is_cfi = false;
-      use_qt = false;
-      v8_builtins_profiling_log_file = "";
-      enable_dangling_raw_ptr_checks = false;
-      dawn_use_built_dxc = false;
-      v8_enable_private_mapping_fork_optimization = true;
-      v8_expose_public_symbols = true;
-      enable_dangling_raw_ptr_feature_flag = false;
-      clang_unsafe_buffers_paths = "";
-      enterprise_cloud_content_analysis = false;
-    }
-    // lib.optionalAttrs (lib.versionAtLeast info.version "33") {
-      content_enable_legacy_ipc = true;
-    }
-    // {
+    # build/args/all.gn
+    is_electron_build = true;
+    root_extra_deps = [ "//electron" ];
+    node_module_version = info.modules;
+    v8_promise_internal_field_count = 1;
+    v8_embedder_string = "-electron.0";
+    v8_enable_snapshot_native_code_counters = false;
+    v8_enable_javascript_promise_hooks = true;
+    enable_cdm_host_verification = false;
+    proprietary_codecs = true;
+    ffmpeg_branding = "Chrome";
+    enable_printing = true;
+    angle_enable_vulkan_validation_layers = false;
+    dawn_enable_vulkan_validation_layers = false;
+    enable_pseudolocales = false;
+    allow_runtime_configurable_key_storage = true;
+    enable_cet_shadow_stack = false;
+    is_cfi = false;
+    use_qt = false;
+    v8_builtins_profiling_log_file = "";
+    enable_dangling_raw_ptr_checks = false;
+    dawn_use_built_dxc = false;
+    v8_enable_private_mapping_fork_optimization = true;
+    v8_expose_public_symbols = true;
+    enable_dangling_raw_ptr_feature_flag = false;
+    clang_unsafe_buffers_paths = "";
+    enterprise_cloud_content_analysis = false;
+    content_enable_legacy_ipc = true;
 
-      # other
-      enable_widevine = false;
-      override_electron_version = info.version;
-    };
+    # other
+    enable_widevine = false;
+    override_electron_version = info.version;
+  };
 
   installPhase = ''
     runHook preInstall