diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-17 06:01:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-17 06:01:12 +0000 |
commit | 9f82fefa4d6ebdeb0d91da1624b4657a9c398c73 (patch) | |
tree | 7506e6869fa852a80d44ad4b11e0c84057cdc2c4 /pkgs/applications/networking/browsers/chromium | |
parent | 212fb8cd176fcb3d0154074f15b33a01aaa25103 (diff) | |
parent | ff8aa8b9ec0300ce770c7eb0e62a8f95a0d47f13 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch | 13 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.nix | 32 |
2 files changed, 23 insertions, 22 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch index d4f16d26b769e..4ab2c9a8179ba 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/widevine-disable-auto-download-allow-bundle.patch @@ -12,15 +12,16 @@ index 525693b6c10ab..245491e137d39 100644 "ENABLE_MEDIA_FOUNDATION_WIDEVINE_CDM=$enable_media_foundation_widevine_cdm", ] diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni -index 58f073ca562ca..4b242c2618dfb 100644 +index 8b97b7a57419e..69fe548ec2845 100644 --- a/third_party/widevine/cdm/widevine.gni +++ b/third_party/widevine/cdm/widevine.gni -@@ -41,8 +41,7 @@ enable_library_widevine_cdm = - # Widevine CDM can be deployed as a component. Currently only supported on - # desktop platforms. The CDM can be bundled regardless whether - # it's a component. See below. +@@ -42,9 +42,7 @@ enable_library_widevine_cdm = + # desktop platforms. Not enabled for lacros (as it is changing to use the + # ash updated version). The CDM can be bundled regardless whether it's a + # component. See below. -enable_widevine_cdm_component = -- enable_library_widevine_cdm && (is_win || is_mac || is_linux || is_chromeos) +- enable_library_widevine_cdm && +- (is_win || is_mac || is_linux || is_chromeos_ash) +enable_widevine_cdm_component = false # Enable (Windows) Media Foundation Widevine CDM component. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 1c0daf2372924..db658cdda73a2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,37 +1,37 @@ { stable = { chromedriver = { - hash_darwin = "sha256-00582jnlAkVkqFsylZnTWfHh5TJkz+m9W8QCXYKerfo="; + hash_darwin = "sha256-ahwPSPoB2h6Zq4ePbvSmYs3WNc+MpBXQYyYLf0ZS3ss="; hash_darwin_aarch64 = - "sha256-EV45I6lav93uMzgZkjypq1RazqtP1W8w8/c4dVZ5hjI="; - hash_linux = "sha256-xCizRpHgcent3D/tMBK+CtXiwtTdH61fja1u8QyECCA="; - version = "124.0.6367.207"; + "sha256-NVqr/i4S4XP+z0+YT6CuDnmyN4GtS6ttyJDOQ05KB+0="; + hash_linux = "sha256-PKuhfBw5FblCUQ60yeQC0McvYu7gPfwwIW1ysN/MwVA="; + version = "125.0.6422.60"; }; deps = { gn = { - hash = "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ="; - rev = "22581fb46c0c0c9530caa67149ee4dd8811063cf"; + hash = "sha256-lrVAb6La+cvuUCNI90O6M/sheOEVFTjgpfA3O/6Odp0="; + rev = "d823fd85da3fb83146f734377da454473b93a2b2"; url = "https://gn.googlesource.com/gn"; - version = "2024-03-14"; + version = "2024-04-10"; }; }; - hash = "sha256-IeIWk4y1dufEnhxqvZbQlFVD8dsoceysiEHqJ2G4Oz8="; - version = "124.0.6367.207"; + hash = "sha256-ewX7oRna7IYCXhAe98HS5HbS1psIEAguhZJ1ymK+dPE="; + version = "125.0.6422.60"; }; ungoogled-chromium = { deps = { gn = { - hash = "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ="; - rev = "22581fb46c0c0c9530caa67149ee4dd8811063cf"; + hash = "sha256-lrVAb6La+cvuUCNI90O6M/sheOEVFTjgpfA3O/6Odp0="; + rev = "d823fd85da3fb83146f734377da454473b93a2b2"; url = "https://gn.googlesource.com/gn"; - version = "2024-03-14"; + version = "2024-04-10"; }; ungoogled-patches = { - hash = "sha256-7Z9j+meVRZYLmreCzHlJe71E9kj5YJ4rrfpQ/deNTpM="; - rev = "124.0.6367.207-1"; + hash = "sha256-I3RQBa4LLuOdZQFKHIqePj9Ozw61dsuAOctqN1abij0="; + rev = "125.0.6422.60-1"; }; }; - hash = "sha256-IeIWk4y1dufEnhxqvZbQlFVD8dsoceysiEHqJ2G4Oz8="; - version = "124.0.6367.207"; + hash = "sha256-ewX7oRna7IYCXhAe98HS5HbS1psIEAguhZJ1ymK+dPE="; + version = "125.0.6422.60"; }; } |