Merge pull request #245289 from bobby285271/upd/pantheon
Pantheon updates 2023-07-25
This commit is contained in:
commit
5c327bc55b
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
|
@ -20,28 +19,20 @@
|
|||
, libgee
|
||||
, libhandy
|
||||
, libical
|
||||
, libportal-gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-calendar";
|
||||
version = "6.1.2";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "calendar";
|
||||
rev = version;
|
||||
sha256 = "sha256-psUVgl/7pmmf+8dP8ghBx5C1u4UT9ncXuVYvDJOYeOI=";
|
||||
sha256 = "sha256-qZvSzhLGr4Gg9DSJ638IQRLlPiZkbJUCJ7tZ8ZFZZ1E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# build: support evolution-data-server 3.46
|
||||
# https://github.com/elementary/calendar/pull/758
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/calendar/commit/62c20e5786accd68b96c423b04e32c043e726cac.patch";
|
||||
sha256 = "sha256-xatxoSwAIHiUA03vvBdM8HSW27vhPLvAxEuGK0gLiio=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
@ -63,6 +54,7 @@ stdenv.mkDerivation rec {
|
|||
libgee
|
||||
libhandy
|
||||
libical
|
||||
libportal-gtk3
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
|
@ -19,28 +18,20 @@
|
|||
, libgee
|
||||
, libhandy
|
||||
, libical
|
||||
, libportal-gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-tasks";
|
||||
version = "6.3.1";
|
||||
version = "6.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "tasks";
|
||||
rev = version;
|
||||
sha256 = "sha256-b8KUlfpZxRFDiBjgrV/4XicCcEw2fWaN78NaOq6jQBk=";
|
||||
sha256 = "sha256-6Vwx+NRVGDqZzN5IVk4cQxGjSkYwrrNhUVoB8TRo28U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Port to libsoup 3
|
||||
# https://github.com/elementary/tasks/pull/345
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/tasks/commit/22e0d18693932e9eea3d2a22329f845575ce26e6.patch";
|
||||
sha256 = "sha256-nLJlKf4L7G12ZnCo4wezyMRyeAf+Tf0OGHyT8I1ZuDA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
@ -61,6 +52,7 @@ stdenv.mkDerivation rec {
|
|||
libgee
|
||||
libhandy
|
||||
libical
|
||||
libportal-gtk3
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-keyboard";
|
||||
version = "3.1.1";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DofAOv7sCe7RAJpgz9PEYm+C8RAl0a1KgFm9jToMsEY=";
|
||||
sha256 = "sha256-X5EGDS8/EazIHiDBHCisd+XPE9dMx/0lQ8hrz9imUno=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -25,13 +25,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-pantheon-shell";
|
||||
version = "6.4.0";
|
||||
version = "6.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GJjtGLCBRISaopZWli/MfqrPcG+xjY7nHZKS+S806GI=";
|
||||
sha256 = "sha256-iq1QXC6eQ2w5j9RCxhTc0dApMfiDGcVuj8nocEFLFNk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
, pkg-config
|
||||
, vala
|
||||
, libgee
|
||||
, libhandy
|
||||
, granite
|
||||
, gtk3
|
||||
, pulseaudio
|
||||
|
@ -16,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-sound";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-a3GYtV0f+I9grnwndGI782/shpUWpR6GrRRD380Q6+o=";
|
||||
sha256 = "sha256-JXt/S+vNzuRaRC0DMX13Lxv+OoAPRQmSLv9fsvnkWY4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
|
|||
gtk3
|
||||
libcanberra-gtk3
|
||||
libgee
|
||||
libhandy
|
||||
pulseaudio
|
||||
switchboard
|
||||
];
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
|
@ -27,6 +28,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-i7fSKnP4W12cfax5IXm/Zgy5vP5z7S43S80gvzWpFCE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix broken notification filter
|
||||
# https://github.com/elementary/notifications/pull/207
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/notifications/commit/4691ec869316be94598d8e55e1cd3bd525e8e149.patch";
|
||||
sha256 = "sha256-4x/Us92Mgws5v+ZQiKvjQ4ixfBnU8oTQ92rc+nf8Zdg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib # for glib-compile-schemas
|
||||
meson
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
, accountsservice
|
||||
, dbus
|
||||
, desktop-file-utils
|
||||
, fwupd
|
||||
, geoclue2
|
||||
, glib
|
||||
, gobject-introspection
|
||||
|
@ -22,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-settings-daemon";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "settings-daemon";
|
||||
rev = version;
|
||||
sha256 = "sha256-5QdCj2Z31t7dxZi7ZZ5g6qLgsMyw7rM5dRw0G8uoC6o=";
|
||||
sha256 = "sha256-464caR36oSUhxCU0utP5eMYiiBekU6W4bVIbsUoiFRI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
accountsservice
|
||||
dbus
|
||||
fwupd
|
||||
geoclue2
|
||||
glib
|
||||
gtk3
|
||||
|
@ -56,8 +58,20 @@ 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 { };
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue