diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-27 12:01:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-27 12:01:56 +0000 |
commit | 433ca822324e45d3f9267e3f7a2cc90e0e66bf04 (patch) | |
tree | ebd3ef727a94034118475dcbbf239a623e66c248 /pkgs/desktops | |
parent | d1b1f7fda7b74c168fc5621e48b0704bb23f73ae (diff) | |
parent | 185638d819896229e0ec947daacdad76823901f5 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/desktops')
3 files changed, 6 insertions, 18 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 94a6e533dda30..c3f31624fff21 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 = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix index 163351075c6a4..a5a011fbaa196 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 = [ diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 134c7f9e8ed02..805956d332792 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 { }; }; |