Compare commits

...

7 commits

Author SHA1 Message Date
nixpkgs-ci[bot]
70439d71da
Merge release-24.11 into staging-next-24.11 2025-06-09 00:21:07 +00:00
Thomas Gerbet
9c4769b92f
[Backport release-24.11] palemoon-bin: 33.7.1 -> 33.7.2 (#414763) 2025-06-08 21:55:39 +02:00
Fabián Heredia Montiel
0e763fb071
[Backport release-24.11] mbedtls_2: 2.28.9 -> 2.28.10 (#414938) 2025-06-08 12:23:54 -06:00
Bobby Rong
be6d5259ee
[Backport release-24.11] webkitgtk_6_0: 2.48.2 → 2.48.3 (#414254) 2025-06-08 16:28:54 +08:00
Felix Singer
7a8f7c6ffd
mbedtls_2: 2.28.9 -> 2.28.10
Signed-off-by: Felix Singer <felixsinger@posteo.net>
(cherry picked from commit ec2b95cf86)
2025-06-08 09:42:14 +02:00
Thomas Gerbet
202bb0a195 palemoon-bin: 33.7.1 -> 33.7.2
https://www.palemoon.org/releasenotes.shtml#v33.7.2
(cherry picked from commit 1e422c3798)
2025-06-07 14:52:53 +00:00
Bobby Rong
77cbc326ed webkitgtk_6_0: 2.48.2 → 2.48.3
https://webkitgtk.org/2025/05/28/webkitgtk2.48.3-released.html
https://github.com/WebKit/WebKit/compare/webkitgtk-2.48.2...webkitgtk-2.48.3
(cherry picked from commit b62b7136cb)
2025-06-05 15:08:06 +00:00
3 changed files with 7 additions and 7 deletions

View file

@ -23,7 +23,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "palemoon-bin";
version = "33.7.1";
version = "33.7.2";
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
@ -174,11 +174,11 @@ stdenv.mkDerivation (finalAttrs: {
{
gtk3 = fetchzip {
urls = urlRegionVariants "gtk3";
hash = "sha256-80L93pQaozdyqMnIswWnS+gNo+xVYv5eFVNnLiK/rcU=";
hash = "sha256-GE45GZ+OmNNwRLTD2pcZpqRA66k4q/+lkQnGJG+z6nQ=";
};
gtk2 = fetchzip {
urls = urlRegionVariants "gtk2";
hash = "sha256-dnDQKRCqADzdotJRUeETqaGV+S+M6/de5LuBgMYYvPE=";
hash = "sha256-yJPmmQ9IkGzort9OPPWzv+LSeJci8VNoso3NLYev51Q=";
};
};

View file

@ -1,6 +1,6 @@
{ callPackage }:
callPackage ./generic.nix {
version = "2.28.9";
hash = "sha256-/Bm05CvS9t7WSh4qoMconCaD7frlmA/H9YDyJOuGuFE=";
version = "2.28.10";
hash = "sha256-09XWds45TFH7GORrju8pVQQQQomU8MlFAq1jJXrLW0s=";
}

View file

@ -81,7 +81,7 @@
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
clangStdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk";
version = "2.48.2";
version = "2.48.3";
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
if lib.versionAtLeast gtk3.version "4.0" then
"6.0"
@ -101,7 +101,7 @@ clangStdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
hash = "sha256-7Fj238JdOzYDiOGS+GUGjWmqsJtNffAh+Q4xTS+lTzc=";
hash = "sha256-1NxZcPD8alKf9/1nvL+rK7tekb54my6SeWQLMhengsM=";
};
patches = lib.optionals clangStdenv.hostPlatform.isLinux [