From bae3aa0327234146499a25d44824b93cb8933616 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Jul 2024 21:21:30 +0800 Subject: [PATCH 1/6] pantheon.elementary-calendar: 7.0.0 -> 8.0.0 https://github.com/elementary/calendar/compare/7.0.0...8.0.0 --- .../pantheon/apps/elementary-calendar/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 24deffaa01ec..43a49528df08 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -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 { }; }; From 33316af5e5a78350ee7a6674c5aa9cb80f385a59 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Jul 2024 21:27:00 +0800 Subject: [PATCH 2/6] pantheon.elementary-settings-daemon: 1.3.1 -> 8.0.0 https://github.com/elementary/settings-daemon/compare/1.3.1...8.0.0 --- .../elementary-settings-daemon/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index ed9da1181514..d2780cdcfe65 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -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 { }; }; From 4de56f190b392c9584e9775227e450d4a599aeca Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Jul 2024 21:32:25 +0800 Subject: [PATCH 3/6] pantheon.elementary-screenshot: 6.0.4 -> 8.0.0 https://github.com/elementary/screenshot/compare/6.0.4...8.0.0 --- .../pantheon/apps/elementary-screenshot/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index f8ca0fe62cd7..9325f5740bcb 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -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 { }; }; From 2980f5d17eaaf93fe2ba0e7ffca664acbcb352c1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Jul 2024 21:35:48 +0800 Subject: [PATCH 4/6] pantheon.elementary-music: 7.1.0 -> 8.0.0 https://github.com/elementary/music/compare/7.1.0...8.0.0 --- .../pantheon/apps/elementary-music/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 258ff8e2dadb..49cc2c2e42bc 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -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. From 6f43c10be8e13be6a5f2247876a14070fd68304d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 26 Jul 2024 21:40:02 +0800 Subject: [PATCH 5/6] pantheon.elementary-videos: 3.0.0 -> 8.0.0 https://github.com/elementary/videos/compare/3.0.0...8.0.0 Ported to GTK4. --- .../apps/elementary-videos/default.nix | 61 ++++++++++--------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 7fb642ce7b7d..9b16c90e0c89 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -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 { }; From 759ee151e75ee9aec951308f9a2305567cf048ac Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 27 Jul 2024 11:31:50 +0800 Subject: [PATCH 6/6] nixosTests.pantheon: Disable flaky test for closing multitasking view org.freedesktop.DBus.Error.NoReply sometimes. --- nixos/tests/pantheon.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index d2a4a009af53..9806a1e3052e 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -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")