movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge staging-next-24.11 into staging-24.11

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2025-06-09 00:21:51 +00:00 • committed by GitHub
commit a0043fd042
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/browsers/palemoon/bin.nix
View file

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

4
pkgs/development/libraries/mbedtls/2.nix
View file

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

4
pkgs/development/libraries/webkitgtk/default.nix
View file

@ -81,7 +81,7 @@
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
clangStdenv.mkDerivation (finalAttrs: { clangStdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk"; pname = "webkitgtk";
version = "2.48.2"; version = "2.48.3";
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${ name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
if lib.versionAtLeast gtk3.version "4.0" then if lib.versionAtLeast gtk3.version "4.0" then
"6.0" "6.0"
@ -101,7 +101,7 @@ clangStdenv.mkDerivation (finalAttrs: {
src = fetchurl { src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; 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 [ patches = lib.optionals clangStdenv.hostPlatform.isLinux [