mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 13:30:36 +00:00
Merge release-26.05 into staging-next-26.05
This commit is contained in:
@@ -5,7 +5,6 @@
|
||||
meson,
|
||||
ninja,
|
||||
gettext,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
gtk4,
|
||||
@@ -40,20 +39,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "epiphany";
|
||||
version = "50.4";
|
||||
version = "50.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Hib5kB8PCL/pQ6pwFjyVMzTH7D1K78jTVOipwUCzNKc=";
|
||||
hash = "sha256-RYIiqGlM/JFOei1t6YeQZwAajWXgCpB9lhEgWcZ61EY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Required for `CVE-2026-18487.patch` to apply
|
||||
(fetchpatch {
|
||||
name = "fix-ipv6-address-prettification.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/e63bfdc7f117c9b60ea54b5760363ab256b9ff2b.patch";
|
||||
hash = "sha256-9m8R5GUOBCm3xDXVHBDrV/HbjfIDL+D3wUGkkqc4RmA==";
|
||||
})
|
||||
# Upstream issue: https://gitlab.gnome.org/GNOME/epiphany/-/work_items/2897
|
||||
# Upstream PR: https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/2123
|
||||
./CVE-2026-18487.patch
|
||||
|
||||
@@ -31,7 +31,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gcr";
|
||||
version = "4.4.0.1";
|
||||
version = "4.4.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gcr/${lib.versions.majorMinor finalAttrs.version}/gcr-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-DDw0Hkn59PJTKkiEUJgEGQoMJmPmEgNguymMXRdKgJg=";
|
||||
hash = "sha256-xEQsFdQzDxeh9RlN8IxXaHevaEEqslIURqk71eJMkxs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -44,7 +44,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gdm";
|
||||
version = "50.2";
|
||||
version = "50.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-ikZ55Hzd/osKG9nTg2BC3raPs+Gw5+Yt/QYx3FtvxUE=";
|
||||
hash = "sha256-rawHELi3lxCOpA6kVzvRpebZsk4KeZCplCFujf/i0V4=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -31,11 +31,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-maps";
|
||||
version = "50.3";
|
||||
version = "50.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-CJyo4Vq9cqyD2zhs7xnOveBe74t26qyBkGpLBTVUTiw=";
|
||||
hash = "sha256-zUtwISjr7UEourEEiRc7mv0Mn1TwpOqUJAag0GSOayY=";
|
||||
};
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
@@ -73,7 +73,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-shell";
|
||||
version = "50.4";
|
||||
version = "50.5";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-xTGTlTnbMWpBrvI2cDcKvRMw0yVPhLyw+fTa5dbjYs8=";
|
||||
hash = "sha256-/HS+6oWexzZLTXBsWPU6JAt8ywDj8i/CTBrczX0TUBA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -48,11 +48,11 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-software";
|
||||
version = "50.3";
|
||||
version = "50.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-sTGOaPArs5AvzY+QTVbwP1NOpQmPZeTGu5wskk2n+CM=";
|
||||
hash = "sha256-XB/LxxnlJTwCmnt1yxSoqLpAj/7uTZRfyQGCsXT4o/M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-user-docs";
|
||||
version = "50.4";
|
||||
version = "50.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major finalAttrs.version}/gnome-user-docs-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-zYdoQ1NDY1uy3P9pygORZxVTJGnEZd9IBMN63ZihNJc=";
|
||||
hash = "sha256-rbLjWOtyYx2+kPdBI00NKUmAfiryRu8muykByKjpsh4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libcloudproviders";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/libcloudproviders/${lib.versions.majorMinor finalAttrs.version}/libcloudproviders-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-JHsijRAnsmg4aOfXCA04aTpFfpCKrdDBGdUt5Zo5gGQ=";
|
||||
hash = "sha256-PhI/oqNPbf2ZiX6+X+w9+jXZz0sZLCj+f8kMWq+vz1s=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libgsf";
|
||||
version = "1.14.58";
|
||||
version = "1.14.59";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "GNOME";
|
||||
repo = "libgsf";
|
||||
tag = "LIBGSF_${lib.replaceString "." "_" finalAttrs.version}";
|
||||
hash = "sha256-0QQas3AsH46OOCSuezoBSeIQSilaenl50stpNwNJsKc=";
|
||||
hash = "sha256-dhDVKsIdBiTg8mZxv3Byi24PCGJCJo4inJe5rCgqcBU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmsgraph";
|
||||
version = "0.3.4";
|
||||
version = "0.3.5";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/msgraph/${lib.versions.majorMinor finalAttrs.version}/msgraph-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-BzHs5rArMu7/u72Y79x3vAPd0gZR7q46Q0Pwh5sE1sc=";
|
||||
hash = "sha256-49rb9jjQIHBA9tpthS21FuRjQj2nEK9svDXQBXLxfZs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -48,11 +48,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "localsearch";
|
||||
version = "3.11.1";
|
||||
version = "3.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/localsearch/${lib.versions.majorMinor finalAttrs.version}/localsearch-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-ezmmwoqKzysXLxWy+17nx6N2TER8L0oUyqI5t+vmGUI=";
|
||||
hash = "sha256-Zc9QqL5Uv/gfsf+rU5iQyC0SiViA8R+72IFRQryek98=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
runCommand,
|
||||
lib,
|
||||
stdenv,
|
||||
@@ -72,7 +71,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "50.4";
|
||||
version = "50.5";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Jz0zyHWry0tsvqP07ARdGBVfvFEMNSH8fkeSY3ExCYg=";
|
||||
hash = "sha256-cvpaeDR7A6bpmifb21+lzDs4iyPupzzkUBKBjbmLeUE=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
@@ -184,17 +183,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]))
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix HDR corruption by reverting this commit. See:
|
||||
# - https://gitlab.gnome.org/GNOME/mutter/-/work_items/4952
|
||||
# - https://gitlab.gnome.org/GNOME/mutter/-/work_items/4967
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/a1ae71798ef1ab2e0d2f753f5c98b38b1039b056.patch";
|
||||
hash = "sha256-J2eKhM3YEFEVmcpMq2SxSOsPeEWrJTv+UcBDO+gRC4M=";
|
||||
revert = true;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs src/backends/native/gen-default-modes.py
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nautilus";
|
||||
version = "50.2.2";
|
||||
version = "50.3.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-4eKF7930LtMN2lsp9/jSQtq0vBQJqQVIY7NnutSzTVo=";
|
||||
hash = "sha256-cdVHA8xglduCm6oTrZ2FPRi0nLhMrj4Lkn7W889nmh8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "papers";
|
||||
version = "50.2";
|
||||
version = "50.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-rhvc8c1Hy1DJ2EdleEYH+Bxy3xfdbmrZM/6hQXPSufQ=";
|
||||
hash = "sha256-PtKyLUiUNR8CRB6GiKBgO2USJr/VEBKflSeAA1460ko=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -24,11 +24,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yelp";
|
||||
version = "49.1";
|
||||
version = "49.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/yelp/${lib.versions.major finalAttrs.version}/yelp-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Pj6U7y0slIfMUQYuOvv6FXjOvSnYDIQ1e21+5tz9inQ=";
|
||||
hash = "sha256-WvyOdzCEUe5F7pGe/uWhVMo8FTqQ4qG1jOv3gnq4itA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Reference in New Issue
Block a user