From e7cfc23ce4f2a347e2d3abe48d53ab9b4afc9b52 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 26 Jul 2023 12:15:22 +0800 Subject: [PATCH 1/4] pantheon.elementary-settings-daemon: 1.3.0 -> 1.3.1 https://github.com/elementary/settings-daemon/releases/tag/1.3.1 --- .../elementary-settings-daemon/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 134c7f9e8ed0..805956d33279 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = "settings-daemon"; rev = version; - sha256 = "sha256-464caR36oSUhxCU0utP5eMYiiBekU6W4bVIbsUoiFRI="; + sha256 = "sha256-mEmc9uLwUTObsP70P0G2vcRdQF6do/wMTQjvfLUU//o="; }; nativeBuildInputs = [ @@ -58,20 +58,8 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py - - substituteInPlace data/io.elementary.settings-daemon.check-for-firmware-updates.service \ - --replace "/usr/bin/busctl" "${systemd}/bin/busctl" ''; - postInstall = '' - # https://github.com/elementary/settings-daemon/pull/75 - mkdir -p $out/etc/xdg/autostart - ln -s $out/share/applications/io.elementary.settings-daemon.desktop $out/etc/xdg/autostart/io.elementary.settings-daemon.desktop - ''; - - # https://github.com/elementary/settings-daemon/pull/74 - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - passthru = { updateScript = nix-update-script { }; }; From 1865a3e4ace559584e510cd67192220bc6e286f0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 26 Jul 2023 12:19:53 +0800 Subject: [PATCH 2/4] pantheon.wingpanel-indicator-a11y: 1.0.1 -> 1.0.2 https://github.com/elementary/wingpanel-indicator-a11y/releases/tag/1.0.2 --- .../pantheon/desktop/wingpanel-indicators/a11y/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix index 163351075c6a..a5a011fbaa19 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-a11y"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-iS+xTCjbRZfaUiOtHbQ+/SaajfWWAlC9XiZbIGZPO9I="; + sha256 = "sha256-HECK+IEUAKJ4F1TotTHF84j4BYS6EZdAtLBoM401+mw="; }; nativeBuildInputs = [ From 3abda3dfda254c24569d5ff140aa83714dbdd13b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 26 Jul 2023 12:22:51 +0800 Subject: [PATCH 3/4] pantheon.elementary-greeter: 6.1.1 -> 7.0.0 https://github.com/elementary/greeter/releases/tag/7.0.0 --- pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 94a6e533dda3..c3f31624fff2 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "6.1.1"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "greeter"; rev = version; - sha256 = "sha256-6rjZOX9JOTjZwqWVWTtKjGNy8KgWllE9VQZzwhuBAwE="; + sha256 = "sha256-m/xuaMCAPoqhl/M547mdafBPBu3UhHmVmBIUKQoS5L8="; }; patches = [ From 497229d3c2e56c72ef582c0575d0dcf5a2320731 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 27 Jul 2023 14:08:53 +0800 Subject: [PATCH 4/4] nixos/pantheon: Install orca ref: https://github.com/elementary/greeter/commit/ec0eb376891c59ced4e486fe94e8f28f4e7b93bc --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index e87ae5ae8124..a8a291a203c8 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -199,6 +199,7 @@ in gnome.adwaita-icon-theme gtk3.out # for gtk-launch program onboard + orca # elementary/greeter#668 qgnomeplatform sound-theme-freedesktop xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/