From dd7bc4e6c4390c215e435501f561fff2973bd671 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 12 Aug 2024 15:00:15 +0000 Subject: [PATCH] =?UTF-8?q?gnome-settings-daemon:=2046.0=20=E2=86=92=2047.?= =?UTF-8?q?beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/46.0...47.beta Changelog-reviewed-by: Bobby Rong --- .../gn/gnome-settings-daemon/package.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix index 7466859ec72e..24559a18c07d 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -3,7 +3,6 @@ lib, substituteAll, fetchurl, - fetchpatch, meson, ninja, pkg-config, @@ -43,11 +42,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-settings-daemon"; - version = "46.0"; + version = "47.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz"; - hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c="; + hash = "sha256-uY7RXPmWYNhIsIxZeth2n4w8JVnB4wvF5Burza/QOCo="; }; patches = [ @@ -58,18 +57,6 @@ stdenv.mkDerivation (finalAttrs: { src = ./fix-paths.patch; inherit tzdata; }) - - (fetchpatch { - name = "backport-no-systemd-fix-1.patch"; - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/46f998d7308cb18832666bc34ee54b1d9c27739f.patch"; - includes = [ "plugins/sharing/gsd-sharing-manager.c" ]; - hash = "sha256-P5FJUY50Pg3MuwHwGUz28/TMZkT7j+fmGPozWb9rVYo="; - }) - (fetchpatch { - name = "backport-no-systemd-fix-2.patch"; - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/1a4d50f4ee611bdede6072c0bfd2a1b2e327c5fc.patch"; - hash = "sha256-pROhnE9GziS9h0nMWZBsd8YtW6RxMrwmaSOe0UtkUJU="; - }) ]; nativeBuildInputs = [