Merge pull request #246783 from bobby285271/upd/pantheon
Pantheon updates 2023-08-02
This commit is contained in:
commit
cf684a79f7
|
@ -1,7 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
, appstream
|
, appstream
|
||||||
, desktop-file-utils
|
, desktop-file-utils
|
||||||
|
@ -9,7 +8,6 @@
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, polkit
|
, polkit
|
||||||
, python3
|
|
||||||
, vala
|
, vala
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, editorconfig-core-c
|
, editorconfig-core-c
|
||||||
|
@ -28,24 +26,15 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "elementary-code";
|
pname = "elementary-code";
|
||||||
version = "7.0.0";
|
version = "7.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "elementary";
|
owner = "elementary";
|
||||||
repo = "code";
|
repo = "code";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-6ZOdlOCIDy5aWQre15+SrTH/vhY9OeTffY/uTSroELc=";
|
sha256 = "sha256-Dtm0+NqDwfn5HUQEYtHTiyrpM3mHp1wUFOGaxH86YUo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix global search action disabled at startup
|
|
||||||
# https://github.com/elementary/code/pull/1254
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/elementary/code/commit/1e75388b07c060cc10ecd612076f235b1833fab8.patch";
|
|
||||||
sha256 = "sha256-8Djh1orMcmICdYwQFENJCaYlXK0E52NhCmuhlHCz7oM=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
appstream
|
appstream
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
|
@ -53,7 +42,6 @@ stdenv.mkDerivation rec {
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
polkit # needed for ITS rules
|
polkit # needed for ITS rules
|
||||||
python3
|
|
||||||
vala
|
vala
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
@ -79,11 +67,6 @@ stdenv.mkDerivation rec {
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
chmod +x meson/post_install.py
|
|
||||||
patchShebangs meson/post_install.py
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = nix-update-script { };
|
updateScript = nix-update-script { };
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,7 +10,10 @@
|
||||||
, gtk3
|
, gtk3
|
||||||
, libxml2
|
, libxml2
|
||||||
, libhandy
|
, libhandy
|
||||||
|
, libportal-gtk3
|
||||||
, webkitgtk_4_1
|
, webkitgtk_4_1
|
||||||
|
, elementary-gtk-theme
|
||||||
|
, elementary-icon-theme
|
||||||
, folks
|
, folks
|
||||||
, glib-networking
|
, glib-networking
|
||||||
, granite
|
, granite
|
||||||
|
@ -21,13 +24,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "elementary-mail";
|
pname = "elementary-mail";
|
||||||
version = "7.1.0";
|
version = "7.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "elementary";
|
owner = "elementary";
|
||||||
repo = "mail";
|
repo = "mail";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-dvDlvn8KvFmiP/NClRtHNEs5gPTUjlzgTYmgIaCfoLw=";
|
sha256 = "sha256-hBOogZ9ZNS9KnuNn+jNhTtlupBxZL2DG/CiuBR1kFu0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -41,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
elementary-icon-theme
|
||||||
evolution-data-server
|
evolution-data-server
|
||||||
folks
|
folks
|
||||||
glib-networking
|
glib-networking
|
||||||
|
@ -48,6 +52,7 @@ stdenv.mkDerivation rec {
|
||||||
gtk3
|
gtk3
|
||||||
libgee
|
libgee
|
||||||
libhandy
|
libhandy
|
||||||
|
libportal-gtk3
|
||||||
webkitgtk_4_1
|
webkitgtk_4_1
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -56,6 +61,15 @@ stdenv.mkDerivation rec {
|
||||||
patchShebangs meson/post_install.py
|
patchShebangs meson/post_install.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
gappsWrapperArgs+=(
|
||||||
|
# The GTK theme is hardcoded.
|
||||||
|
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
|
||||||
|
# The icon theme is hardcoded.
|
||||||
|
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
|
||||||
|
)
|
||||||
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = nix-update-script { };
|
updateScript = nix-update-script { };
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
, meson
|
, meson
|
||||||
, python3
|
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, vala
|
, vala
|
||||||
|
@ -21,20 +20,19 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "switchboard-plug-security-privacy";
|
pname = "switchboard-plug-security-privacy";
|
||||||
version = "7.0.0";
|
version = "7.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "elementary";
|
owner = "elementary";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-J3lUyLNyxlleD2jklXB2jMRvLY6WG5iccA2lIaJL3d4=";
|
sha256 = "sha256-2eQ89FpEMF85UmqVu9FJUvSlaVGmsrRBnhAW7oUiUqg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
python3
|
|
||||||
vala
|
vala
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -51,11 +49,6 @@ stdenv.mkDerivation rec {
|
||||||
zeitgeist
|
zeitgeist
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
chmod +x meson/post_install.py
|
|
||||||
patchShebangs meson/post_install.py
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = nix-update-script { };
|
updateScript = nix-update-script { };
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue