Loading pkgs/applications/networking/browsers/chromium/common.nix +53 −35 Original line number Diff line number Diff line Loading @@ -230,6 +230,7 @@ let isElectron = packageName == "electron"; rustcVersion = buildPackages.rustc.version; llvmVersion = buildPackages.rustc.llvmPackages.llvm.version; # libpng has been replaced by the png rust crate # https://github.com/image-rs/image-png/discussions/562 needsLibpng = !chromiumVersionAtLeast "143"; Loading Loading @@ -555,7 +556,7 @@ let hash = "sha256-0ueOCHYheSFHRFzEat3TDhnU3Avf0TcNBBBpTkz+saw="; }) ] ++ lib.optionals (chromiumVersionAtLeast "144") [ ++ lib.optionals (versionRange "144" "146") [ # Patch rustc_nightly_capability to eval to false instead of true. # https://chromium-review.googlesource.com/c/chromium/src/+/7022369 ./patches/chromium-144-rustc_nightly_capability.patch Loading @@ -576,27 +577,50 @@ let hash = "sha256-k+xCfhDuHxtuGhY7LVE8HvbDJt8SEFkslBcJe7t5CAg="; }) ] ++ lib.optionals (chromiumVersionAtLeast "145" && !ungoogled) [ # Non-backported variant of the patch above for M145 ++ lib.optionals (chromiumVersionAtLeast "146" && !ungoogled) [ # Same as the patch above, but from ungoogled-chromium and much # cleaner (and smaller) than reverting an endless chain of CLs. (fetchpatch { name = "revert-devtools-frontend-esbuild-instead-of-rollup.patch"; # https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7485622 url = "https://chromium.googlesource.com/devtools/devtools-frontend/+/72846d78927b90a77b51b12d13009320a74067e0^!?format=TEXT"; name = "ungoogled-chromium-145-build-with-wasm-rollup.patch"; # https://github.com/ungoogled-software/ungoogled-chromium/blob/145.0.7632.159-1/patches/core/ungoogled-chromium/build-with-wasm-rollup.patch url = "https://github.com/ungoogled-software/ungoogled-chromium/raw/refs/tags/145.0.7632.159-1/patches/core/ungoogled-chromium/build-with-wasm-rollup.patch"; hash = "sha256-Ho5I33FOgtYHvKSZlWXWuBaqnSHqy4+f6EZdiL+/rRQ="; }) ] ++ lib.optionals (chromiumVersionAtLeast "146") [ # Revert CL 7457194 to fix the following error: # ERROR at //chrome/test/BUILD.gn:6355:9: Unable to load "/build/src/components/variations/test_data/cipd/BUILD.gn". # "//components/variations/test_data/cipd:single_group_per_study_prefer_existing_behavior_seed", (fetchpatch { name = "chromium-146-revert-Add-finch-seeds-to-desktop-perf-builds.patch"; # https://chromium-review.googlesource.com/c/chromium/src/+/7457194 url = "https://chromium.googlesource.com/chromium/src/+/d2e8a550eece6051372da94a475a8661da203106^!?format=TEXT"; decode = "base64 -d"; stripLen = 1; extraPrefix = "third_party/devtools-frontend/src/"; revert = true; hash = "sha256-vu60z6PuWavNoEoxW0thSy89WxztOEG50V1ZSfJRRug="; hash = "sha256-tJ//HE7o9R8nSQDGhi+MKXdNUwnkCZI++CzpAmFn2YY="; }) ] ++ lib.optionals (chromiumVersionAtLeast "146" && lib.versionOlder llvmVersion "23") [ # clang++: error: unknown argument: '-fsanitize-ignore-for-ubsan-feature=array-bounds' (fetchpatch { name = "revert-devtools-frontend-reland-use-native-rollup.patch"; # https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7368549 url = "https://chromium.googlesource.com/devtools/devtools-frontend/+/7c2d912b52f18fff4a9ef7bd64608f2feefc0d83^!?format=TEXT"; name = "chromium-146-revert-Update-fsanitizer=array-bounds-config.patch"; # https://chromium-review.googlesource.com/c/chromium/src/+/7539408 url = "https://chromium.googlesource.com/chromium/src/+/acb47d9a6b56c4889a2ed4216e9968cfc740086c^!?format=TEXT"; decode = "base64 -d"; stripLen = 1; extraPrefix = "third_party/devtools-frontend/src/"; revert = true; hash = "sha256-Qa4GvamZ//0WTAZmDXOQJVz9dnYNzBkD8lYcWOHdVIY="; hash = "sha256-WZsN2qm6lX121bDf7SoN75flXtCTmPPpwtHK0ayjkPc="; }) ] ++ lib.optionals (versionRange "146" "147") [ # Backport CL 7594600 from M147 to fix the following error: # error[E0277]: the trait bound `LaneCount<N>: SupportedLaneCount` is not satisfied # --> ../../third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs:152:40 (fetchpatch { name = "chromium-146-backport-Remove-now-obsolete-invalid-patch-on-bytemuck-v1.patch"; # https://chromium-review.googlesource.com/c/chromium/src/+/7594600 url = "https://chromium.googlesource.com/chromium/src/+/90b77efcecb262823fadb67b0ce218846cd9e756^!?format=TEXT"; decode = "base64 -d"; hash = "sha256-iDhDdVscy0tinQCRKXOghrn4ZRwlc8YjPZ0xPv0UMEU="; }) ]; Loading Loading @@ -697,20 +721,6 @@ let '${glibc}/share/locale/' '' # Workaround (crimes) for our rollup/esbuild revert in M145. # https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7414812 # We cannot use fetchpatch{,2} because it silently drops blobs and messes up symlinks. # We cannot use GNU patch (patchPhase) because it does not support git binary diffs. # We cannot use Gerrit/Gitiles because the git sha lengths may change as the repo grows. + lib.optionalString (chromiumVersionAtLeast "145" && !ungoogled) '' ${lib.getExe buildPackages.git} apply --reverse --directory=third_party/devtools-frontend/src/ ${ fetchurl { name = "revert-devtools-frontend-remove-rollup-wasm.patch"; url = "https://github.com/ChromeDevTools/devtools-frontend/commit/a377a8c570a370e1bfccaf82f128e3b977dbf866.patch?full_index=1"; hash = "sha256-83T37ts54iotGYQAAyVv5CF8fMVrh/tfVRhfWaOlUkI="; } } '' + '' # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc Loading Loading @@ -872,11 +882,19 @@ let // (extraAttrs.gnFlags or { }) ); preConfigure = lib.optionalString (!isElectron) '' preConfigure = lib.optionalString (!isElectron) '' ( cd third_party/node grep patch update_npm_deps | sh ) '' # Our node_modules, unlike the tarball from chromium, includes @lit/reactive-element/development, # which causes a "error: TS2403: Subsequent variable declarations must have the same type" later in the build. # TypeScript is parsing both @lit/reactive-element/reactive-element.d.ts and @lit/reactive-element/development/reactive-element.d.ts, # but lit_reactive_element.patch only patches the former. + lib.optionalString (chromiumVersionAtLeast "146") '' rm -r third_party/node/node_modules/@lit/reactive-element/development ''; configurePhase = '' Loading pkgs/applications/networking/browsers/chromium/info.json +124 −124 File changed.Preview size limit exceeded, changes collapsed. Show changes Loading
pkgs/applications/networking/browsers/chromium/common.nix +53 −35 Original line number Diff line number Diff line Loading @@ -230,6 +230,7 @@ let isElectron = packageName == "electron"; rustcVersion = buildPackages.rustc.version; llvmVersion = buildPackages.rustc.llvmPackages.llvm.version; # libpng has been replaced by the png rust crate # https://github.com/image-rs/image-png/discussions/562 needsLibpng = !chromiumVersionAtLeast "143"; Loading Loading @@ -555,7 +556,7 @@ let hash = "sha256-0ueOCHYheSFHRFzEat3TDhnU3Avf0TcNBBBpTkz+saw="; }) ] ++ lib.optionals (chromiumVersionAtLeast "144") [ ++ lib.optionals (versionRange "144" "146") [ # Patch rustc_nightly_capability to eval to false instead of true. # https://chromium-review.googlesource.com/c/chromium/src/+/7022369 ./patches/chromium-144-rustc_nightly_capability.patch Loading @@ -576,27 +577,50 @@ let hash = "sha256-k+xCfhDuHxtuGhY7LVE8HvbDJt8SEFkslBcJe7t5CAg="; }) ] ++ lib.optionals (chromiumVersionAtLeast "145" && !ungoogled) [ # Non-backported variant of the patch above for M145 ++ lib.optionals (chromiumVersionAtLeast "146" && !ungoogled) [ # Same as the patch above, but from ungoogled-chromium and much # cleaner (and smaller) than reverting an endless chain of CLs. (fetchpatch { name = "revert-devtools-frontend-esbuild-instead-of-rollup.patch"; # https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7485622 url = "https://chromium.googlesource.com/devtools/devtools-frontend/+/72846d78927b90a77b51b12d13009320a74067e0^!?format=TEXT"; name = "ungoogled-chromium-145-build-with-wasm-rollup.patch"; # https://github.com/ungoogled-software/ungoogled-chromium/blob/145.0.7632.159-1/patches/core/ungoogled-chromium/build-with-wasm-rollup.patch url = "https://github.com/ungoogled-software/ungoogled-chromium/raw/refs/tags/145.0.7632.159-1/patches/core/ungoogled-chromium/build-with-wasm-rollup.patch"; hash = "sha256-Ho5I33FOgtYHvKSZlWXWuBaqnSHqy4+f6EZdiL+/rRQ="; }) ] ++ lib.optionals (chromiumVersionAtLeast "146") [ # Revert CL 7457194 to fix the following error: # ERROR at //chrome/test/BUILD.gn:6355:9: Unable to load "/build/src/components/variations/test_data/cipd/BUILD.gn". # "//components/variations/test_data/cipd:single_group_per_study_prefer_existing_behavior_seed", (fetchpatch { name = "chromium-146-revert-Add-finch-seeds-to-desktop-perf-builds.patch"; # https://chromium-review.googlesource.com/c/chromium/src/+/7457194 url = "https://chromium.googlesource.com/chromium/src/+/d2e8a550eece6051372da94a475a8661da203106^!?format=TEXT"; decode = "base64 -d"; stripLen = 1; extraPrefix = "third_party/devtools-frontend/src/"; revert = true; hash = "sha256-vu60z6PuWavNoEoxW0thSy89WxztOEG50V1ZSfJRRug="; hash = "sha256-tJ//HE7o9R8nSQDGhi+MKXdNUwnkCZI++CzpAmFn2YY="; }) ] ++ lib.optionals (chromiumVersionAtLeast "146" && lib.versionOlder llvmVersion "23") [ # clang++: error: unknown argument: '-fsanitize-ignore-for-ubsan-feature=array-bounds' (fetchpatch { name = "revert-devtools-frontend-reland-use-native-rollup.patch"; # https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7368549 url = "https://chromium.googlesource.com/devtools/devtools-frontend/+/7c2d912b52f18fff4a9ef7bd64608f2feefc0d83^!?format=TEXT"; name = "chromium-146-revert-Update-fsanitizer=array-bounds-config.patch"; # https://chromium-review.googlesource.com/c/chromium/src/+/7539408 url = "https://chromium.googlesource.com/chromium/src/+/acb47d9a6b56c4889a2ed4216e9968cfc740086c^!?format=TEXT"; decode = "base64 -d"; stripLen = 1; extraPrefix = "third_party/devtools-frontend/src/"; revert = true; hash = "sha256-Qa4GvamZ//0WTAZmDXOQJVz9dnYNzBkD8lYcWOHdVIY="; hash = "sha256-WZsN2qm6lX121bDf7SoN75flXtCTmPPpwtHK0ayjkPc="; }) ] ++ lib.optionals (versionRange "146" "147") [ # Backport CL 7594600 from M147 to fix the following error: # error[E0277]: the trait bound `LaneCount<N>: SupportedLaneCount` is not satisfied # --> ../../third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs:152:40 (fetchpatch { name = "chromium-146-backport-Remove-now-obsolete-invalid-patch-on-bytemuck-v1.patch"; # https://chromium-review.googlesource.com/c/chromium/src/+/7594600 url = "https://chromium.googlesource.com/chromium/src/+/90b77efcecb262823fadb67b0ce218846cd9e756^!?format=TEXT"; decode = "base64 -d"; hash = "sha256-iDhDdVscy0tinQCRKXOghrn4ZRwlc8YjPZ0xPv0UMEU="; }) ]; Loading Loading @@ -697,20 +721,6 @@ let '${glibc}/share/locale/' '' # Workaround (crimes) for our rollup/esbuild revert in M145. # https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7414812 # We cannot use fetchpatch{,2} because it silently drops blobs and messes up symlinks. # We cannot use GNU patch (patchPhase) because it does not support git binary diffs. # We cannot use Gerrit/Gitiles because the git sha lengths may change as the repo grows. + lib.optionalString (chromiumVersionAtLeast "145" && !ungoogled) '' ${lib.getExe buildPackages.git} apply --reverse --directory=third_party/devtools-frontend/src/ ${ fetchurl { name = "revert-devtools-frontend-remove-rollup-wasm.patch"; url = "https://github.com/ChromeDevTools/devtools-frontend/commit/a377a8c570a370e1bfccaf82f128e3b977dbf866.patch?full_index=1"; hash = "sha256-83T37ts54iotGYQAAyVv5CF8fMVrh/tfVRhfWaOlUkI="; } } '' + '' # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc Loading Loading @@ -872,11 +882,19 @@ let // (extraAttrs.gnFlags or { }) ); preConfigure = lib.optionalString (!isElectron) '' preConfigure = lib.optionalString (!isElectron) '' ( cd third_party/node grep patch update_npm_deps | sh ) '' # Our node_modules, unlike the tarball from chromium, includes @lit/reactive-element/development, # which causes a "error: TS2403: Subsequent variable declarations must have the same type" later in the build. # TypeScript is parsing both @lit/reactive-element/reactive-element.d.ts and @lit/reactive-element/development/reactive-element.d.ts, # but lit_reactive_element.patch only patches the former. + lib.optionalString (chromiumVersionAtLeast "146") '' rm -r third_party/node/node_modules/@lit/reactive-element/development ''; configurePhase = '' Loading
pkgs/applications/networking/browsers/chromium/info.json +124 −124 File changed.Preview size limit exceeded, changes collapsed. Show changes