mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Merge pull request #330174 from bobby285271/upd/pantheon

Browse source 
Pantheon updates 2024-07-26
This commit is contained in:
Bobby Rong 2024-07-27 12:38:35 +08:00 committed by GitHub
parent b99083a43e 759ee151e7
commit eb084d18d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 49 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/tests/pantheon.nix
View file

@ -96,9 +96,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
cmd = "dbus-send --session --dest=org.pantheon.gala --print-reply /org/pantheon/gala org.pantheon.gala.PerformAction int32:1"
env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus DISPLAY=:0"
machine.succeed(f"su - ${user.name} -c '{env} {cmd}'")
machine.sleep(3)
machine.sleep(5)
machine.screenshot("multitasking")
machine.succeed(f"su - ${user.name} -c '{env} {cmd}'")
with subtest("Check if gala has ever coredumped"):
machine.fail("coredumpctl --json=short | grep gala")

11
pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
View file

@ -5,7 +5,6 @@
, meson
, ninja
, pkg-config
, python3
, vala
, wrapGAppsHook3
, clutter
@ -24,20 +23,19 @@
stdenv.mkDerivation rec {
pname = "elementary-calendar";
version = "7.0.0";
version = "8.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "calendar";
rev = version;
sha256 = "sha256-qZvSzhLGr4Gg9DSJ638IQRLlPiZkbJUCJ7tZ8ZFZZ1E=";
sha256 = "sha256-gBQfrRSaw3TKcsSAQh/hcTpBoEQstGdLbppoZ1/Z1q8=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
python3
vala
wrapGAppsHook3
];
@ -57,11 +55,6 @@ stdenv.mkDerivation rec {
libportal-gtk3
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script { };
};

13
pkgs/desktops/pantheon/apps/elementary-music/default.nix
View file

@ -5,7 +5,6 @@
, meson
, ninja
, pkg-config
, python3
, vala
, wrapGAppsHook4
, elementary-gtk-theme
@ -14,24 +13,24 @@
, granite7
, gst_all_1
, gtk4
, libadwaita
}:
stdenv.mkDerivation rec {
pname = "elementary-music";
version = "7.1.0";
version = "8.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "music";
rev = version;
sha256 = "sha256-L+E5gDtIgVkfmOIhzS7x8vtyMJYqx/UQpYMChrt2Tgo=";
sha256 = "sha256-pqOAeHTFWSoJqXE9UCUkVIy5T7EoYsieJ4PMU1oX9ko=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
python3
vala
wrapGAppsHook4
];
@ -41,6 +40,7 @@ stdenv.mkDerivation rec {
glib
granite7
gtk4
libadwaita
] ++ (with gst_all_1; [
gst-plugins-bad
gst-plugins-base
@ -49,11 +49,6 @@ stdenv.mkDerivation rec {
gstreamer
]);
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
preFixup = ''
gappsWrapperArgs+=(
# The GTK theme is hardcoded.

11
pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
View file

@ -6,7 +6,6 @@
, meson
, ninja
, vala
, python3
, desktop-file-utils
, gtk3
, granite
@ -18,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "elementary-screenshot";
version = "6.0.4";
version = "8.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "screenshot";
rev = version;
sha256 = "sha256-xG67a19ySuYc5IXlEkaqhnDpDa2krF2y6PnhJkd/rOg=";
sha256 = "sha256-z7FP+OZYF/9YLXYCQF/ElihKjKHVfeHc38RHdPb2aIE=";
};
nativeBuildInputs = [
@ -32,7 +31,6 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
python3
vala
wrapGAppsHook3
];
@ -45,11 +43,6 @@ stdenv.mkDerivation rec {
libhandy
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script { };
};

61
pkgs/desktops/pantheon/apps/elementary-videos/default.nix
View file

@ -1,28 +1,30 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, pkg-config
, meson
, ninja
, vala
, gtk3
, granite
, libgee
, libhandy
, gst_all_1
, wrapGAppsHook3
{
stdenv,
lib,
fetchFromGitHub,
nix-update-script,
meson,
ninja,
pkg-config,
vala,
wrapGAppsHook4,
gdk-pixbuf,
granite7,
gst_all_1,
gtk4,
libadwaita,
libgee,
}:
stdenv.mkDerivation rec {
pname = "elementary-videos";
version = "3.0.0";
version = "8.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "videos";
rev = version;
sha256 = "sha256-O98478E3NlY2NYqjyy8mcXZ3lG+wIV+VrPzdzOp44yA=";
hash = "sha256-GfTYwnNZg8/cmJMzLDfYpulG7K4SMYK2H+SXtiS3TCg=";
};
nativeBuildInputs = [
@ -30,23 +32,24 @@ stdenv.mkDerivation rec {
ninja
pkg-config
vala
wrapGAppsHook3
wrapGAppsHook4
];
buildInputs = [
granite
gtk3
libgee
libhandy
] ++ (with gst_all_1; [
gst-libav
gst-plugins-bad
gst-plugins-base
gdk-pixbuf
granite7
gst_all_1.gst-libav
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
# https://github.com/elementary/videos/issues/356
(gst-plugins-good.override { gtkSupport = true; })
gst-plugins-ugly
gstreamer
]);
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
gst_all_1.gst-plugins-rs # GTK 4 Sink
gst_all_1.gst-plugins-ugly
gst_all_1.gstreamer
gtk4
libadwaita
libgee
];
passthru = {
updateScript = nix-update-script { };

17
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
View file

@ -5,31 +5,33 @@
, meson
, ninja
, pkg-config
, python3
, vala
, accountsservice
, dbus
, desktop-file-utils
, fwupd
, gdk-pixbuf
, geoclue2
, gexiv2
, glib
, gobject-introspection
, gtk3
, granite
, libgee
, packagekit
, systemd
, wrapGAppsHook3
}:
stdenv.mkDerivation rec {
pname = "elementary-settings-daemon";
version = "1.3.1";
version = "8.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "settings-daemon";
rev = version;
sha256 = "sha256-mEmc9uLwUTObsP70P0G2vcRdQF6do/wMTQjvfLUU//o=";
sha256 = "sha256-e70OVdvyKzzF+W7epzj23/Q1lsJiSJd7z1fj41sWfWU=";
};
nativeBuildInputs = [
@ -38,7 +40,6 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
python3
vala
wrapGAppsHook3
];
@ -47,19 +48,17 @@ stdenv.mkDerivation rec {
accountsservice
dbus
fwupd
gdk-pixbuf
geoclue2
gexiv2
glib
gtk3
granite
libgee
packagekit
systemd
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script { };
};