Merge pull request #209615 from bobby285271/upd/cinnamon

Cinnamon updates 2023-01-08

12 files changed, 27 insertions, 82 deletions

diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix
index eaf3f90138172..8e86b35cf7cc1 100644
--- a/pkgs/applications/backup/timeshift/unwrapped.nix
+++ b/pkgs/applications/backup/timeshift/unwrapped.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "timeshift";
-  version = "22.11.1";
+  version = "22.11.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "timeshift";
     rev = version;
-    sha256 = "JYYiqJzLszaCJSl7fDb9Oz8tdIYAnqEbJoRg4zw3wbg=";
+    sha256 = "yZNERRoNZ1K7BRiAu7sqVQyhghsS/AeZSODMVSm46oY=";
   };
 
   patches = [
diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
index eedfaee00c59c..605b5bc286abf 100644
--- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lightdm-slick-greeter";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "slick-greeter";
     rev = version;
-    sha256 = "sha256-XoGha0DyrtrGXW72Zvnk1FrvULPMYc0FvQj4JFSKxXo=";
+    sha256 = "sha256-k/E3bR63kesHQ/we+ctC0UEYE5YdZ6Lv5lYuXqCOvKA=";
   };
 
   nativeBuildInputs = [
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
     substituteInPlace src/slick-greeter.vala \
       --replace "/usr/bin/numlockx" "${numlockx}/bin/numlockx" \
       --replace "/usr/share/xsessions/" "/run/current-system/sw/share/xsessions/" \
+      --replace "/usr/share/wayland-sessions/" "/run/current-system/sw/share/wayland-sessions/" \
       --replace "/usr/bin/slick-greeter" "${placeholder "out"}/bin/slick-greeter"
 
     substituteInPlace src/session-list.vala \
diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
index ceee75dd69799..b3a16ed3fc35f 100644
--- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-control-center";
-  version = "5.6.0";
+  version = "5.6.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-WK35uDckIYU4HwuYtLj+CFVJD8O78LTQcnOvjp/et2s=";
+    hash = "sha256-rp3K7SqGw8da2U61VjKiqUyT5vCUVk4XZdRYtLwRtfQ=";
   };
 
   buildInputs = [
diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
index 0a724023418bf..c9c718fb7da91 100644
--- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-desktop";
-  version = "5.6.0";
+  version = "5.6.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-ajtKvy9CMr+Vsmdn49ZWYtbniZV1dqWJGTou3QY4oPc=";
+    hash = "sha256-h2Jl/4SreniZtxziDwM0iwHXgGBrnHu8NLkIX7VGP18=";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
index 981b6a5d4578d..e6a615bb12af1 100644
--- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-screensaver";
-  version = "5.6.2";
+  version = "5.6.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-xsxNGDFiBzVtoCV94iUuia45FRJGyGO522u6p1AIR6g=";
+    hash = "sha256-S4+9ZTpDwwvYTc3gz0YQBYjgygp8KP94azkiJcH6xCk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
index 47a1e092d15c1..1fcc9fb6a29a8 100644
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-settings-daemon";
-  version = "5.6.0";
+  version = "5.6.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-VUGOBvMInruX1JVk9ECP8++FUrBQwDJhkZT/1pPg2wU=";
+    hash = "sha256-QR77O3rFfY0+6cKoS75xoFRplNo4nvTMtR2rNKZERYE=";
   };
 
   patches = [
diff --git a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
index c2190a65308d0..31b453b0bea90 100644
--- a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
+++ b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
@@ -5,13 +5,14 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-cursor-themes";
-  version = "unstable-2022-11-29";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
-    rev = "aa6bb767831ac43d1768c2e639de713a4a1eba8d";
-    hash = "sha256-UQnRrylUo9zuDiAwQ1COtXMtq4XTbxtMle41p+pzxJc=";
+    # They don't really do tags, this is just a named commit.
+    rev = "e17f8a4620827235dabbe5221bd0ee8c44dad0d5";
+    hash = "sha256-yLUmIVh884uDVkNil7qxf6t/gykipzBvPgzwmY3zvQk=";
   };
 
   installPhase = ''
diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix
index 7b9957f2392cc..58a9008e33871 100644
--- a/pkgs/desktops/cinnamon/muffin/default.nix
+++ b/pkgs/desktops/cinnamon/muffin/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , substituteAll
 , cairo
 , cinnamon-desktop
@@ -36,7 +35,7 @@
 
 stdenv.mkDerivation rec {
   pname = "muffin";
-  version = "5.6.2";
+  version = "5.6.3";
 
   outputs = [ "out" "dev" "man" ];
 
@@ -44,7 +43,7 @@ stdenv.mkDerivation rec {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-bHEBzl0aBXsHOhSWJUz428pG5M6L0s/Q6acKO+2oMXo=";
+    hash = "sha256-qcm1CRUMKFx4KDXBnaIVLHuZTzSMEWEBFTWMe85pJDE=";
   };
 
   patches = [
@@ -52,13 +51,6 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       zenity = gnome.zenity;
     })
-
-    # compositor: Fix crash when restarting Cinnamon
-    # https://github.com/linuxmint/muffin/pull/655
-    (fetchpatch {
-      url = "https://github.com/linuxmint/muffin/commit/1a941ec603a1565dbd2f943f7da6e877d1541bcb.patch";
-      sha256 = "sha256-6x64rWQ20ZjM9z79Pg6QMDPeFN5VNdDHBueRvy2kA6c=";
-    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix
index ef5762cd14174..58be1f5b81cb6 100644
--- a/pkgs/desktops/cinnamon/nemo/default.nix
+++ b/pkgs/desktops/cinnamon/nemo/default.nix
@@ -23,24 +23,19 @@
 
 stdenv.mkDerivation rec {
   pname = "nemo";
-  version = "5.6.1";
+  version = "5.6.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-ztx3Y+n9Bpzuz06mbkis3kdlM/0JrOaMDbRF5glzkDE=";
+    sha256 = "sha256-JwwSeY+TsbYc2ZXoxR9aja0Hb8AmrWK79cv1ApAgcpQ=";
   };
 
   patches = [
     # Load extensions from NEMO_EXTENSION_DIR environment variable
     # https://github.com/NixOS/nixpkgs/issues/78327
     ./load-extensions-from-env.patch
-
-    # Don't populate nemo actions from /run/current-system/sw/share
-    # They should only be loaded exactly once from $out/share
-    # https://github.com/NixOS/nixpkgs/issues/190781
-    ./fix-nemo-actions-duplicate-menu-items.patch
   ];
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch b/pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch
deleted file mode 100644
index 3a555774c4504..0000000000000
--- a/pkgs/desktops/cinnamon/nemo/fix-nemo-actions-duplicate-menu-items.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/libnemo-private/nemo-action-manager.c b/libnemo-private/nemo-action-manager.c
-index 4dac198..b671421 100644
---- a/libnemo-private/nemo-action-manager.c
-+++ b/libnemo-private/nemo-action-manager.c
-@@ -146,6 +146,8 @@ set_up_actions_directories (NemoActionManager *action_manager)
-     data_dirs = (gchar **) g_get_system_data_dirs ();
- 
-     for (i = 0; i < g_strv_length (data_dirs); i++) {
-+        if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0)
-+            continue;
-         path = g_build_filename (data_dirs[i], "nemo", "actions", NULL);
-         uri = g_filename_to_uri (path, NULL, NULL);
- 
-diff --git a/src/nemo-action-config-widget.c b/src/nemo-action-config-widget.c
-index fc4075e..6e1c837 100644
---- a/src/nemo-action-config-widget.c
-+++ b/src/nemo-action-config-widget.c
-@@ -221,6 +221,8 @@ refresh_widget (NemoActionConfigWidget *widget)
-     data_dirs = (gchar **) g_get_system_data_dirs ();
- 
-     for (i = 0; i < g_strv_length (data_dirs); i++) {
-+        if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0)
-+            continue;
-         path = g_build_filename (data_dirs[i], "nemo", "actions", NULL);
-         populate_from_directory (widget, path);
-         g_clear_pointer (&path, g_free);
-@@ -390,6 +392,8 @@ static void setup_dir_monitors (NemoActionConfigWidget *widget)
- 
-     guint i;
-     for (i = 0; i < g_strv_length (data_dirs); i++) {
-+        if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0)
-+            continue;
-         gchar *path = g_build_filename (data_dirs[i], "nemo", "actions", NULL);
-         try_monitor_path (widget, path);
-         g_free (path);
-diff --git a/src/nemo-script-config-widget.c b/src/nemo-script-config-widget.c
-index 3a2d349..b8a85b4 100644
---- a/src/nemo-script-config-widget.c
-+++ b/src/nemo-script-config-widget.c
-@@ -288,6 +288,8 @@ static void setup_dir_monitors (NemoScriptConfigWidget *widget)
- 
-     guint i;
-     for (i = 0; i < g_strv_length (data_dirs); i++) {
-+        if (g_strcmp0 (data_dirs[i], "/run/current-system/sw/share") == 0)
-+            continue;
-         gchar *path = g_build_filename (data_dirs[i], "nemo", "actions", NULL);
-         try_monitor_path (widget, path);
-         g_free (path);
diff --git a/pkgs/desktops/cinnamon/nemo/wrapper.nix b/pkgs/desktops/cinnamon/nemo/wrapper.nix
index 7f7633d19a855..604247566b84c 100644
--- a/pkgs/desktops/cinnamon/nemo/wrapper.nix
+++ b/pkgs/desktops/cinnamon/nemo/wrapper.nix
@@ -24,6 +24,10 @@ symlinkJoin {
         --set "NEMO_PYTHON_EXTENSION_DIR" "$out/share/nemo-python/extensions"
     done
 
+    # Don't populate the same nemo actions twice when having this globally installed
+    # https://github.com/NixOS/nixpkgs/issues/190781#issuecomment-1365601853
+    rm -r $out/share/nemo/actions
+
     # Point to wrapped binary in all service files
     for file in "share/dbus-1/services/nemo.FileManager1.service" \
       "share/dbus-1/services/nemo.service"
diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix
index 73ba5d99d3972..9002c10e6120c 100644
--- a/pkgs/desktops/cinnamon/xviewer/default.nix
+++ b/pkgs/desktops/cinnamon/xviewer/default.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xviewer";
-  version = "3.2.11";
+  version = "3.2.12";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-EyrK4mnAHt/Lypuz7XX7+GFGfkfC5VDIit2WYZawI04=";
+    sha256 = "sha256-tiZeC862gHbZt76sbxseUu9vWN+1huftXpE7lQLkGKU=";
   };
 
   nativeBuildInputs = [