diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2025-03-21 22:09:04 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2025-03-22 18:00:32 +0000 |
| commit | d202afb598eed0963258fb5bfc34ce5159743770 (patch) | |
| tree | e542f3a131d1e89642bce5342bbacf93b16aa8ae | |
| parent | [Backport release-24.11] mastodon: 4.3.4 -> 4.3.6 (#389693) (diff) | |
| download | nixpkgs-origin/backport-391948-to-release-24.11.tar.gz | |
webkitgtk_6_0: 2.46.6 → 2.48.0origin/backport-391948-to-release-24.11
- speech synthesis no longer experimental
- do not rely on icu being propagated from harfbuzz
https://github.com/WebKit/WebKit/compare/webkitgtk-2.46.6...webkitgtk-2.48.0
https://webkitgtk.org/2024/10/29/webkitgtk2.47.1-released.html
https://webkitgtk.org/2024/11/26/webkitgtk2.47.2-released.html
https://webkitgtk.org/2025/01/21/webkitgtk2.47.3-released.html
https://webkitgtk.org/2025/02/05/webkitgtk2.47.4-released.html
https://webkitgtk.org/2025/02/25/webkitgtk2.47.90-released.html
https://webkitgtk.org/2025/03/14/webkitgtk2.48.0-released.html
https://webkitgtk.org/security/WSA-2025-0002.html
CVE-2024-44192, CVE-2024-54467, CVE-2025-24201
(cherry picked from commit 6c57ac8b3090d7022bd5ac1a072f297bdbdd6311)
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 21aabb38cd6d..6cc602310514 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -37,6 +37,7 @@ libxslt, harfbuzz, hyphen, + icu, libsysprof-capture, libpthreadstubs, nettle, @@ -80,7 +81,7 @@ # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.46.6"; + version = "2.48.0"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${ if lib.versionAtLeast gtk3.version "4.0" then "6.0" @@ -100,7 +101,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-8rMd5pMiC6m6t2zm3f5bC/qyUVyysKcPPFTUBQdmwys="; + hash = "sha256-lJBKVc8S1EpONs6tr/8C1G2nPXa+m0dp80y/3w7r+I4="; }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ @@ -145,6 +146,7 @@ clangStdenv.mkDerivation (finalAttrs: { at-spi2-core cairo # required even when using skia enchant2 + flite libavif libepoxy libjxl @@ -153,6 +155,7 @@ clangStdenv.mkDerivation (finalAttrs: { gst-plugins-base harfbuzz hyphen + icu libGL libGLU mesa # for libEGL headers @@ -215,7 +218,7 @@ clangStdenv.mkDerivation (finalAttrs: { geoclue2 ] ++ lib.optionals enableExperimental [ - flite + # For ENABLE_WEB_RTC openssl ] ++ lib.optionals withLibsecret [ |