Merge pull request #142810 from bobby285271/pantheon

Pantheon updates 2021-10-25, 2021-10-26

Author: bobby285271

nixos/modules/services/x11/desktop-managers/pantheon.nix

@@ -227,8 +227,10 @@ in
       environment.sessionVariables.GTK_CSD = "1";
       environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
 
-      xdg.portal.extraPortals = [
-        pkgs.pantheon.elementary-files
+      xdg.portal.extraPortals = with pkgs; [
+        pantheon.elementary-files
+        pantheon.elementary-settings-daemon
+        xdg-desktop-portal-pantheon
       ];
 
       # Override GSettings schemas

pkgs/applications/misc/tootle/default.nix

@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , nix-update-script
 , fetchpatch
-, vala
+, vala_0_52
 , meson
 , ninja
 , pkg-config
@@ -35,7 +35,9 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     python3
-    vala
+    # Does not build with vala 0.54
+    # https://github.com/bleakgrey/tootle/issues/337
+    vala_0_52
     wrapGAppsHook
   ];
 

pkgs/desktops/gnome/core/epiphany/default.nix

@@ -3,6 +3,7 @@
 , ninja
 , gettext
 , fetchurl
+, fetchpatch
 , pkg-config
 , gtk3
 , glib
@@ -46,12 +47,30 @@ stdenv.mkDerivation rec {
     sha256 = "s50YJUkllbC3TF1qZoaoV/lBnfpMAvgBPCl7yHDibdA=";
   };
 
-  patches = lib.optionals withPantheon [
-    # Make this respect dark mode settings from Pantheon
+  patches = [
+    # tab-view: Update close button position on startup
+    # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1025
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/6e9d6d3cf7fa7ddf21a70e9816a5cd4767a79523.patch";
+      sha256 = "sha256-lBVliGCIKwTvsYnWjAcmJxhTg1HS/2x4wlOh+4sx/xQ=";
+    })
+  ] ++ lib.optionals withPantheon [
+    # Pantheon specific patches for epiphany
     # https://github.com/elementary/browser
-    # The patch currently differs from upstream (updated for epiphany 40 and 41).
-    ./pantheon-dark-style.patch
-    ./pantheon-navigation-buttons.patch
+    #
+    # Make this respect dark mode settings from Pantheon
+    # https://github.com/elementary/browser/pull/21
+    # https://github.com/elementary/browser/pull/41
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/dark-style.patch";
+      sha256 = "sha256-RzMUc9P51UN3tRFefzRtMniXR9duOOmLj5eu5gL2TEQ=";
+    })
+    # Patch to unlink nav buttons
+    # https://github.com/elementary/browser/pull/18
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/navigation-buttons.patch";
+      sha256 = "sha256-G1/JUjn/8DyO9sgL/5Kq205KbTOs4EMi4Vf3cJ8FHXU=";
+    })
   ];
 
   nativeBuildInputs = [

pkgs/desktops/gnome/core/epiphany/pantheon-dark-style.patch

@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation rec {
   pname = "appcenter";
-  version = "3.8.0";
+  version = "3.8.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "07lkdpnjj9pxbq8h794qjiidvnysvzx0132w98r1wg9k7ca170bj";
+    sha256 = "sha256-d7DGyAC8itBxTfuabDPN16W4S4d42s5UPp8AusZfy5k=";
   };
 
   patches = [

pkgs/desktops/gnome/core/epiphany/pantheon-navigation-buttons.patch

@@ -1,14 +1,14 @@
-From b1e09653d755ca6ffd03a1e3e67750e6bcc2bc6f Mon Sep 17 00:00:00 2001
+From c1916699cd388cc8d9968127e43ba955471623bf Mon Sep 17 00:00:00 2001
 From: Bobby Rong <rjl931189261@126.com>
-Date: Wed, 22 Sep 2021 11:54:48 +0800
+Date: Wed, 27 Oct 2021 09:33:15 +0800
 Subject: [PATCH 2/2] Drop homepage banner
 
 ---
  src/Views/Homepage.vala | 181 +---------------------------------------
  1 file changed, 1 insertion(+), 180 deletions(-)
 
 diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala
-index 576fc02c..80a1d221 100644
+index 52cb36cc..80a1d221 100644
 --- a/src/Views/Homepage.vala
 +++ b/src/Views/Homepage.vala
 @@ -31,67 +31,12 @@ public class AppCenter.Homepage : AbstractView {
@@ -193,7 +193,7 @@ index 576fc02c..80a1d221 100644
 -                }
 -            }
 -
--            if (!installed && !(package in packages_in_banner) && !package.is_explicit) {
+-            if (!installed && !(package in packages_in_banner)) {
 -                var package_row = new AppCenter.Widgets.ListPackageRowGrid (package);
 -                recently_updated_carousel.add (package_row);
 -            }

pkgs/desktops/pantheon/apps/appcenter/default.nix

@@ -21,15 +21,15 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-calculator";
-  version = "1.7.0";
+  version = "1.7.1";
 
   repoName = "calculator";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "1kl2iximcmbk8inklb2xav7dp08lp5pn9xxa59327zw13gdy8fkf";
+    sha256 = "sha256-GoQFWhEhUBVLYL1vsIIBMT8pKc0dK/ploiGfUtJAJQU=";
   };
 
   passthru = {

pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch

@@ -28,21 +28,15 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-calendar";
-  version = "6.0.2";
+  version = "6.0.3";
 
   repoName = "calendar";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "16xp8gfgpyz9xpjsxm6jlk4skkknj65g0q4x0qvw9sg9f1p6a514";
-  };
-
-  passthru = {
-    updateScript = nix-update-script {
-      attrPath = "pantheon.${pname}";
-    };
+    sha256 = "sha256-+RQUiJLuCIbmcbtsOCfF9HYFrxtldZMbg2vg/a/IOaY=";
   };
 
   nativeBuildInputs = [
@@ -78,6 +72,12 @@ stdenv.mkDerivation rec {
     patchShebangs meson/post_install.py
   '';
 
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = "pantheon.${pname}";
+    };
+  };
+
   meta = with lib; {
     description = "Desktop calendar app designed for elementary OS";
     homepage = "https://github.com/elementary/calendar";

pkgs/desktops/pantheon/apps/elementary-calculator/default.nix

@@ -25,21 +25,15 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-camera";
-  version = "6.0.0";
+  version = "6.0.1";
 
   repoName = "camera";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "1z5c6pkc7psglxwzby5idsdxvplpi28ckjxrwdngnr22knfdcgag";
-  };
-
-  passthru = {
-    updateScript = nix-update-script {
-      attrPath = "pantheon.${pname}";
-    };
+    sha256 = "sha256-OdBinryF6XTcvtY4A1wdDVazjf/VritEGF97ts6d4RY=";
   };
 
   nativeBuildInputs = [
@@ -75,6 +69,12 @@ stdenv.mkDerivation rec {
     patchShebangs meson/post_install.py
   '';
 
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = "pantheon.${pname}";
+    };
+  };
+
   meta = with lib; {
     description = "Camera app designed for elementary OS";
     homepage = "https://github.com/elementary/camera";