From 3f0861beb2878acb3d0052c59b20dd9f66e70942 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 13:40:08 +0000 Subject: [PATCH 01/15] =?UTF-8?q?epiphany:=2046.1=20=E2=86=92=2046.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/46.1...46.2 --- pkgs/by-name/ep/epiphany/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix index c4edd298aff7..7485d3dd62ee 100644 --- a/pkgs/by-name/ep/epiphany/package.nix +++ b/pkgs/by-name/ep/epiphany/package.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "epiphany"; - version = "46.1"; + version = "46.2"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz"; - hash = "sha256-Jg+BRp7WR0bCsRQ/Lzi+3NloR3hlZ7CX2fcv072dsUI="; + hash = "sha256-+5Mtp6JOh/HtuQC1uUJRtCs3CAdThkZRwFncbJPLUEk="; }; nativeBuildInputs = [ From 9f7883c638b141da70927073ad2e75e894ce9407 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 13:59:04 +0000 Subject: [PATCH 02/15] =?UTF-8?q?evolution:=203.52.2=20=E2=86=92=203.52.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.52.2...3.52.3 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index f605aa3617b2..dbebc978d209 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.52.2"; + version = "3.52.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-pIt0EtE+2sdPbAms+mdmVuahLt8AMM3cJgKawE2j5VE="; + hash = "sha256-HCL1O1VU4mCkjpF/PWaYNNJOTTrVoSTL4EKipKzkQcU="; }; nativeBuildInputs = [ From e15cef8381f0ef9dc033aee2b3fa8613eea0024d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:01:05 +0000 Subject: [PATCH 03/15] =?UTF-8?q?evolution-data-server:=203.52.2=20?= =?UTF-8?q?=E2=86=92=203.52.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.52.2...3.52.3 ENABLE_UOA is gone for a while: https://gitlab.gnome.org/GNOME/evolution-data-server/-/commit/66121edf92f8babe8de8d970faf2155ca8824c07 --- .../ev/evolution-data-server/hardcode-gsettings.patch | 2 +- pkgs/by-name/ev/evolution-data-server/package.nix | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index 140e124fe4bb..dad575c05bbf 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -481,7 +481,7 @@ index 734f194..5b05077 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c -index c8bbd3a..e71e36a 100644 +index 3a9ce9c..f96b840 100644 --- a/src/libedataserver/e-oauth2-service-yahoo.c +++ b/src/libedataserver/e-oauth2-service-yahoo.c @@ -67,7 +67,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index d774ea2f2685..4fb4c39bad6f 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.52.2"; + version = "3.52.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-oAakTtyzjSb/scYuHV0KMdHy5ZB1Vl4mx5ou4BxFp+U="; + hash = "sha256-6fbIDBQgM7GAG8yqYiHEU9406tTqCJsghrGQhvmpwuQ="; }; patches = [ @@ -129,7 +129,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DENABLE_UOA=OFF" "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" From 9fa2a5ca664b5a2eadaad375a64094dcd59d3556 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:15:24 +0000 Subject: [PATCH 04/15] =?UTF-8?q?evolution-ews:=203.52.2=20=E2=86=92=203.5?= =?UTF-8?q?2.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.52.2...3.52.3 --- .../mailreaders/evolution/evolution-ews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index aa38ee7cb8d3..5cd6608cbb6d 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.52.2"; + version = "3.52.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-qVUPG1PUdANt0jmWJ7MRjrO4QxhBztwO3yFFewlhkUE="; + hash = "sha256-H9Y4L9X9MAQ4Rc/F3Ew0/gErzINRK2AwFUJQvGGAaMA="; }; patches = [ From de2ed0503307eedde58c39241603bf0b87932e86 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:16:18 +0000 Subject: [PATCH 05/15] =?UTF-8?q?gexiv2:=200.14.2=20=E2=86=92=200.14.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gexiv2/-/compare/gexiv2-0.14.2...gexiv2-0.14.3 --- pkgs/development/libraries/gexiv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 9753f78ec83e..c560a3fc10e9 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.14.2"; + version = "0.14.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Kgyc9I++izQ1AIhm/9QLjt2wZn0iErQjlv32iOk84L4="; + sha256 = "IeZNLFbpszPUT+8/KkslZT2SLEGazZcvqW+raVIX4sg="; }; nativeBuildInputs = [ From 5e3514cc3f4cfc1073f27fadc9f6e24c23d195ad Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:17:13 +0000 Subject: [PATCH 06/15] =?UTF-8?q?gnome.gnome-control-center:=2046.2=20?= =?UTF-8?q?=E2=86=92=2046.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/46.2...46.3 Some tests are now disabled if Xvfb is missing, I imagine we don't need xvfb-run when the X11SessionTestCase helper actually takes care of X and system/session bus. https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/51bf36ac68051aaf183c1aa0b45b8af7cc479c70 --- .../core/gnome-control-center/default.nix | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 6602a3795834..8b1ae6d34136 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -68,16 +68,16 @@ , gnome-user-share , gnome-remote-desktop , wrapGAppsHook4 -, xvfb-run +, xorgserver }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-YzXGy4Fk5XTbUh//Yc+j36pV8dtmrjvKAnUKGT4cTz0="; + hash = "sha256-l9xsfR3uGVkU88vIRbaBZLdhFIDYk760EQBsFerkbLk="; }; patches = [ @@ -155,9 +155,10 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dbus + python3.pkgs.pygobject3 # for test-networkmanager-service.py python3.pkgs.python-dbusmock setxkbmap - xvfb-run + xorgserver ]; doCheck = true; @@ -167,19 +168,10 @@ stdenv.mkDerivation (finalAttrs: { addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" ''; - checkPhase = '' - runHook preCheck - - testEnvironment=( - # Basically same as https://github.com/NixOS/nixpkgs/pull/141299 - "ADW_DISABLE_PORTAL=1" - "XDG_DATA_DIRS=${glib.getSchemaDataDirPath gsettings-desktop-schemas}" - ) - - env "''${testEnvironment[@]}" xvfb-run \ - meson test --print-errorlogs - - runHook postCheck + preCheck = '' + # Basically same as https://github.com/NixOS/nixpkgs/pull/141299 + export ADW_DISABLE_PORTAL=1 + export XDG_DATA_DIRS=${glib.getSchemaDataDirPath gsettings-desktop-schemas} ''; postInstall = '' From 541feca0fb77231e6a186b751754453bbeeda660 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:18:29 +0000 Subject: [PATCH 07/15] =?UTF-8?q?gnome.gnome-initial-setup:=2046.2=20?= =?UTF-8?q?=E2=86=92=2046.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/46.2...46.3 I don't know why we need to set PKG_CONFIG_SYSTEMD_SYSUSERSDIR so I just dropped it, it looks like the prefix is properly replaced in upstream's meson.build via pkgconfig_define. --- pkgs/desktops/gnome/core/gnome-initial-setup/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 19280b1bff92..2d40503c1d70 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-initial-setup"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz"; - hash = "sha256-bHktiSrbYLDeC33oglwUlD0c0nmvT5x2So9UEbYKjyc="; + hash = "sha256-o/AQgp9NTI1J+Dqxz6uCG2GyeA6eC15Wicfv8/hE7T4="; }; patches = [ @@ -90,8 +90,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dvendor-conf-file=${./vendor.conf}" ]; - PKG_CONFIG_SYSTEMD_SYSUSERSDIR = "${placeholder "out"}/lib/sysusers.d"; - passthru = { updateScript = gnome.updateScript { packageName = "gnome-initial-setup"; From 346519c003b2c52965d2fec6f36fffbc2dbf059e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:19:38 +0000 Subject: [PATCH 08/15] =?UTF-8?q?gnome-online-accounts:=203.50.2=20?= =?UTF-8?q?=E2=86=92=203.50.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/compare/3.50.2...3.50.3 --- pkgs/development/libraries/gnome-online-accounts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 43ce34ec2ed4..4b5df003dcf7 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.50.2"; + version = "3.50.3"; outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-3xatl10TnGv8TrsuyLuDJyl6eR7yvwuXfHgHavX6qY4="; + hash = "sha256-5xSmfRccVxRDYet07oKhexXQqCIo/xiM+ScE9WJsopQ="; }; mesonFlags = [ From 7cb770e70bf9e89466cc46c487cd79305a98176f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:20:24 +0000 Subject: [PATCH 09/15] =?UTF-8?q?orca:=2046.1=20=E2=86=92=2046.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/ORCA_46_1...ORCA_46_2 --- pkgs/by-name/or/orca/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index edc89bbaf2ba..026b7fdbf0b6 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -28,13 +28,13 @@ python3.pkgs.buildPythonApplication rec { pname = "orca"; - version = "46.1"; + version = "46.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-z2deNQwYrA+ilDbGVZ0dqXX3///vqAjr5HbY+enRERQ="; + hash = "sha256-j2MpmxpPnDCFfCKfapzhbyxD6u6pD7+QkxTKi7c+/V4="; }; patches = [ From 17364a70e346ee292cdc34c6b9b68c3a57403902 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:21:21 +0000 Subject: [PATCH 10/15] =?UTF-8?q?gnome.gnome-remote-desktop:=2046.2=20?= =?UTF-8?q?=E2=86=92=2046.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/46.2...46.3 --- pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index e7a70f2369e4..b4dde2708d64 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-l0Q+r/5LGmliaIakHSXL6ywUjT/tQ9khFcG30g1SOKs="; + hash = "sha256-CMZlbxHUY560lyqJKej1AkJ9weLqAz4CyZK7Gkx315Q="; }; nativeBuildInputs = [ From b11e88b3adee452e2ff85009327e5bd22906bfb3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:22:15 +0000 Subject: [PATCH 11/15] =?UTF-8?q?gnome.gnome-shell:=2046.2=20=E2=86=92=204?= =?UTF-8?q?6.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/46.2...46.3.1 I am mostly confused by b9b5f9a, actually I don't think we need jasmine-gjs in 46.x. Dropping gtk3 and libstartup_notification: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/27b9985da3f4e098e1bb9aa27a15d9151af7efc4 Verified that gtk3 is really not needed by `grep -nr '3\.0'` in src. While at it explicitly add libX11 and libxml2 as direct deps. --- .../gnome/core/gnome-control-center/default.nix | 2 +- pkgs/desktops/gnome/core/gnome-shell/default.nix | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 8b1ae6d34136..8e1683729484 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { python3.pkgs.pygobject3 # for test-networkmanager-service.py python3.pkgs.python-dbusmock setxkbmap - xorgserver + xorgserver # for Xvfb ]; doCheck = true; diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 3f91cddc2052..3e2b20bcafcb 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -14,7 +14,6 @@ , networkmanager , gi-docgen , at-spi2-core -, libstartup_notification , unzip , shared-mime-info , libgweather @@ -43,7 +42,6 @@ , gjs , mutter , evolution-data-server-gtk4 -, gtk3 , gtk4 , libadwaita , sassc @@ -59,6 +57,10 @@ , asciidoc , bash-completion , mesa +, libGL +, libXi +, libX11 +, libxml2 }: let @@ -66,13 +68,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "46.2"; + version = "46.3.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-a1hxAcBL+zZKsJzTi12T6+60JUdUyAfPcS+8juP94jg="; + hash = "sha256-575fxu4sxSitJh3HpVyN5aMkEtPWhAoKB14PwSoH/4s="; }; patches = [ @@ -131,13 +133,11 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf librsvg networkmanager - libstartup_notification gjs mutter libpulseaudio evolution-data-server-gtk4 libical - gtk3 gtk4 libadwaita gdm @@ -151,6 +151,10 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop gnome-settings-daemon mesa + libGL # for egl, required by mutter-clutter + libXi # required by libmutter + libX11 + libxml2 # recording pipewire From 3db6da5dc1901c05fb1dacf9c35dc162e650685e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:22:52 +0000 Subject: [PATCH 12/15] =?UTF-8?q?gnome.gnome-software:=2046.2=20=E2=86=92?= =?UTF-8?q?=2046.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/46.2...46.3 --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index bca1ea13b5e3..3d219b96adc2 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-5wDLood2T14iVVFOMS4WBVD9v3pdP+FjWLtve2cyuXQ="; + hash = "sha256-nWvB9jfYGytZhYN5BPBe1wdgAUfZrxYLqJEqvy1C8TY="; }; patches = [ From 9f6d2a22dcfc1a27394b0904493a8f24e1d684ee Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:23:47 +0000 Subject: [PATCH 13/15] =?UTF-8?q?gnome.gnome-sudoku:=2046.2=20=E2=86=92=20?= =?UTF-8?q?46.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sudoku/-/compare/46.2...46.3 --- pkgs/desktops/gnome/games/gnome-sudoku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 95941a08cb79..4e7af73c76cd 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-K8wzwpHkTVJEj9saRwqKsJ9TxCMEBPbuCoakir8qNGw="; + hash = "sha256-OKJqwUvlO2w0/9UuxmhSVpFEQHSF4xsvgXkn0hdmUSQ="; }; nativeBuildInputs = [ From 380f61aa821146e016a011be07338e66e1824657 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:27:10 +0000 Subject: [PATCH 14/15] =?UTF-8?q?libpeas2:=202.0.2=20=E2=86=92=202.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libpeas/-/compare/2.0.2...2.0.3 --- pkgs/development/libraries/libpeas/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix index e2d1bf0f8231..f223231eaf0b 100644 --- a/pkgs/development/libraries/libpeas/2.x.nix +++ b/pkgs/development/libraries/libpeas/2.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "2.0.2"; + version = "2.0.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-8w3/7WPKL0BHe0DhccCjH4DZFCW6Hh5HMg7mQlSA7MM="; + hash = "sha256-OeO1B8KdLQHfE0XpszgP16nQrrWy5lfTjmwr6lAj5fA="; }; patches = [ From 64d1c74c652f9f0bf4e3f8843ee8731a7376c312 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 2 Jul 2024 14:28:19 +0000 Subject: [PATCH 15/15] =?UTF-8?q?gnome.mutter:=2046.2=20=E2=86=92=2046.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/46.2...46.3 --- pkgs/desktops/gnome/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index a53eb5b7cfe3..9c10140c3cc2 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "46.2"; + version = "46.3"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-AJuqd/g2JhLKouGMM4obPIqtO1/ilkwv73gk0yEiiYM="; + hash = "sha256-cWgKkXTS/ThIgby2CrFQBAD+6DwMvP69kJQHqaQUTYo="; }; mesonFlags = [