From 312a38afbeba76ad80d37683c02eaa625abcc467 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 18:42:07 +0800
Subject: [PATCH 01/30] cinnamon.xapp: 2.4.3 -> 2.6.1

https://github.com/linuxmint/xapp/compare/2.4.3...2.6.1
---
 pkgs/desktops/cinnamon/xapp/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix
index e09912478429..7139dce15c79 100644
--- a/pkgs/desktops/cinnamon/xapp/default.nix
+++ b/pkgs/desktops/cinnamon/xapp/default.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation rec {
   pname = "xapp";
-  version = "2.4.3";
+  version = "2.6.1";
 
   outputs = [ "out" "dev" ];
 
@@ -30,9 +30,13 @@ stdenv.mkDerivation rec {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-j04vy/uVWY08Xdxqfo2MMUAlqsUMJTsAt67+XjkdhFg=";
+    hash = "sha256-ZxIPiDLcMHEmlnrImctI2ZfH3AIOjB4m/RPGipJ7koM=";
   };
 
+  # Recommended by upstream, which enables the build of xapp-debug.
+  # https://github.com/linuxmint/xapp/issues/169#issuecomment-1574962071
+  mesonBuildType = "debugoptimized";
+
   nativeBuildInputs = [
     meson
     ninja
@@ -70,11 +74,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file
-
-    patchShebangs \
-      libxapp/g-codegen.py \
-      meson-scripts/g-codegen.py \
-      schemas/meson_install_schemas.py
+    patchShebangs schemas/meson_install_schemas.py
 
     # Patch pastebin & inxi location
     sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info

From a15f3418cfc57b31a7aade92a376dd3892ab7d0b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 18:55:30 +0800
Subject: [PATCH 02/30] cinnamon.xreader: 3.6.3 -> 3.8.1

https://github.com/linuxmint/xreader/compare/3.6.3...3.8.1
---
 pkgs/desktops/cinnamon/xreader/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix
index eea8ead9ac76..b56c5a037e09 100644
--- a/pkgs/desktops/cinnamon/xreader/default.nix
+++ b/pkgs/desktops/cinnamon/xreader/default.nix
@@ -16,7 +16,7 @@
 , poppler
 , libspectre
 , libgxps
-, webkitgtk
+, webkitgtk_4_1
 , nodePackages
 , ninja
 , gsettings-desktop-schemas
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xreader";
-  version = "3.6.3";
+  version = "3.8.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-KuCcOnhM8AzKC8hfBpdcnC/ubDVsElKMZuxEnTcJLn0=";
+    sha256 = "sha256-ZmaY9FlDIJNQ9jYkUJDnKAgwn5wlQY89eWx3/RJZA7E=";
   };
 
   nativeBuildInputs = [
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     poppler
     libspectre
     libgxps
-    webkitgtk
+    webkitgtk_4_1
     nodePackages.mathjax
     djvulibre
   ];

From ab005b65dc21c15c8270bea78d106ee4e5f4a04e Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 18:57:46 +0800
Subject: [PATCH 03/30] cinnamon.xviewer: 3.2.12 -> 3.4.1

https://github.com/linuxmint/xviewer/compare/3.2.12...3.4.1
---
 pkgs/desktops/cinnamon/xviewer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix
index 9002c10e6120..c03ba5145b5e 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.12";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-tiZeC862gHbZt76sbxseUu9vWN+1huftXpE7lQLkGKU=";
+    sha256 = "sha256-HVxCBqaKtsEGhGAB+dBCOnjAjLZHv0XqTifPrvoYdj8=";
   };
 
   nativeBuildInputs = [

From da20b8bc4adabba546e04962ce36a74cf9dedaa8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 19:01:09 +0800
Subject: [PATCH 04/30] xed-editor: 3.2.8 -> 3.4.1

https://github.com/linuxmint/xed/compare/3.2.8...3.4.1
---
 pkgs/applications/editors/xed-editor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix
index 0796dbe72185..a1508e7a3b62 100644
--- a/pkgs/applications/editors/xed-editor/default.nix
+++ b/pkgs/applications/editors/xed-editor/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xed-editor";
-  version = "3.2.8";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xed";
     rev = version;
-    sha256 = "sha256-ax769qjV0oZ6tnEE5FsXNbHETI6KNgvh0WviBsPs9j8=";
+    sha256 = "sha256-fBwxc6n4sNNRiKcax96Tl3cFD+Ryvmj+XizB3z2s4+Q=";
   };
 
   nativeBuildInputs = [

From c33ef407cdea9a63490dcb20bb7817696489d7ad Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 19:05:48 +0800
Subject: [PATCH 05/30] xdg-desktop-portal-xapp: 1.0.0 -> 1.0.1

https://github.com/linuxmint/xdg-desktop-portal-xapp/compare/1.0.0...1.0.1
---
 .../libraries/xdg-desktop-portal-xapp/default.nix     | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
index 80d409c080cb..5b447e8b8891 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
@@ -4,7 +4,6 @@
 , meson
 , ninja
 , pkg-config
-, python3
 , wrapGAppsHook
 , cinnamon
 , glib
@@ -16,20 +15,19 @@
 
 stdenv.mkDerivation rec {
   pname = "xdg-desktop-portal-xapp";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xdg-desktop-portal-xapp";
     rev = version;
-    hash = "sha256-oXV4u/w4MWhKHf5vNbUNcyEJpKVFWcyEs1HEqo6eCyU=";
+    hash = "sha256-N0LVgk3VT0Fax1GTB7jzFhwzNEeAuyFHAuxXNCo2o3Y=";
   };
 
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
-    python3
     wrapGAppsHook
   ];
 
@@ -46,11 +44,6 @@ stdenv.mkDerivation rec {
     "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
   ];
 
-  postPatch = ''
-    chmod +x data/meson_install_schemas.py
-    patchShebangs data/meson_install_schemas.py
-  '';
-
   meta = with lib; {
     description = "Backend implementation for xdg-desktop-portal for Cinnamon, MATE, Xfce";
     homepage = "https://github.com/linuxmint/xdg-desktop-portal-xapp";

From 79b41ca7c1e35bbb8fcbe10f1b6ca125187ef122 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 19:37:27 +0800
Subject: [PATCH 06/30] cinnamon.folder-color-switcher: 1.5.5 -> 1.5.7

https://github.com/linuxmint/folder-color-switcher/compare/5e0b768b...03311d62
---
 .../folder-color-switcher/default.nix         | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix
index a3909b820ba9..cc7f7e7cdcf6 100644
--- a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix
+++ b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix
@@ -2,27 +2,34 @@
 , lib
 , fetchFromGitHub
 , gettext
+, python3
 }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "folder-color-switcher";
-  version = "1.5.5";
+  version = "1.5.7";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     # They don't really do tags, this is just a named commit.
-    rev = "5e0b768b3a5bf88a828a2489b9428997b797c1ed";
-    sha256 = "sha256-DU75LM5v2/E/ZmqQgyiPsOOEUw9QQ/NXNtGDFzzYvyY=";
+    rev = "03311d62a62e2cd7d0592b241c287091161ec6b6";
+    sha256 = "sha256-HQv9vSpRSBjqbncGFv+O5XQtRJ+4Cq0aWZHoj5BhKYE=";
   };
 
   nativeBuildInputs = [
     gettext
+    python3.pkgs.wrapPython
   ];
 
   postPatch = ''
     substituteInPlace usr/share/nemo-python/extensions/nemo-folder-color-switcher.py \
-      --replace "/usr/share" "$out/share"
+      --replace "/usr/share/locale" "$out/share" \
+      --replace "/usr/share/folder-color-switcher/colors.d" "/run/current-system/sw/share/folder-color-switcher/colors.d" \
+      --replace "/usr/share/folder-color-switcher/color.svg" "$out/share/folder-color-switcher/color.svg"
+
+    substituteInPlace usr/share/caja-python/extensions/caja-folder-color-switcher.py \
+      --replace "/usr/share/folder-color-switcher/colors.d" "/run/current-system/sw/share/folder-color-switcher/colors.d"
   '';
 
   installPhase = ''
@@ -34,6 +41,13 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
+  preFixup = ''
+    # For Gdk.cairo_surface_create_from_pixbuf()
+    # TypeError: Couldn't find foreign struct converter for 'cairo.Surface'
+    buildPythonPath ${python3.pkgs.pycairo}
+    patchPythonScript $out/share/nemo-python/extensions/nemo-folder-color-switcher.py
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/linuxmint/folder-color-switcher";
     description = "Change folder colors for Nemo and Caja";

From e0034fb28417e76c613baf5e79d124c39d513686 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 20:08:28 +0800
Subject: [PATCH 07/30] cinnamon.mint-artwork: 1.7.3 -> 1.7.5

Read debian/changelog for what is changed.
---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix | 2 +-
 pkgs/desktops/cinnamon/mint-artwork/default.nix          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 7ced5b63c839..dbcfb25b2603 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -71,7 +71,7 @@ in
           package = mkDefault pkgs.cinnamon.mint-themes;
         };
         iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-y-icons) {
-          name = mkDefault "Mint-Y-Aqua";
+          name = mkDefault "Mint-Y-Sand";
           package = mkDefault pkgs.cinnamon.mint-y-icons;
         };
         cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) {
diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix
index 490c4fa068f3..22dd4d15a266 100644
--- a/pkgs/desktops/cinnamon/mint-artwork/default.nix
+++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "mint-artwork";
-  version = "1.7.3";
+  version = "1.7.5";
 
   src = fetchurl {
     urls = [
       "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
-      "https://web.archive.org/web/20221206154838/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
+      "https://web.archive.org/web/20230601120342/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"
     ];
-    hash = "sha256-lusYlmTL71VTGSJFssuIZVu7xJMuZQ7wj2rMtO1lhZ8=";
+    hash = "sha256-yd2FyGAznXGnHJLkMsSNqIx0sbKHl3cNMr7tpue7BlA=";
   };
 
   nativeBuildInputs = [

From 5f362f7689f519d39324c9250e441319125083e7 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 20:55:00 +0800
Subject: [PATCH 08/30] cinnamon.cjs: 5.6.1 -> 5.8.0

https://github.com/linuxmint/cjs/compare/5.6.1...5.8.0
---
 pkgs/desktops/cinnamon/cjs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix
index 167924fe6d15..0c07b46822a7 100644
--- a/pkgs/desktops/cinnamon/cjs/default.nix
+++ b/pkgs/desktops/cinnamon/cjs/default.nix
@@ -6,7 +6,7 @@
 , cairo
 , glib
 , readline
-, spidermonkey_78
+, spidermonkey_102
 , meson
 , dbus
 , ninja
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cjs";
-  version = "5.6.1";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cjs";
     rev = version;
-    hash = "sha256-f9esbQi5WWSMAGlEs9HJFToOvmOrbP2lDW1gGh/48gw=";
+    hash = "sha256-DKCe8dKdYfdeWQ9Iqr0AmDU7YDN9QrQGdTkrBV/ywV0=";
   };
 
   outputs = [ "out" "dev" ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
     cairo
     readline
-    spidermonkey_78
+    spidermonkey_102
     dbus # for dbus-run-session
   ];
 

From 91e2d86304560c55bb7f3034be1579cb8f3978b8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 20:56:11 +0800
Subject: [PATCH 09/30] cinnamon.cinnamon-menus: 5.6.0 -> 5.8.0

https://github.com/linuxmint/cinnamon-menus/compare/5.6.0...5.8.0
---
 pkgs/desktops/cinnamon/cinnamon-menus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
index 599e580a5bab..1b5dbeb8d085 100644
--- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-menus";
-  version = "5.6.0";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-6IOlXQhAy6YrSqybfGFUyn3Q2COvzwpj67y/k/YLNhU=";
+    hash = "sha256-AgA/DA7I9/0AJhlmgk0yAOJaZzpiQV1vM949Y6EOWVg=";
   };
 
   buildInputs = [

From 70cc177a30287b2675a7cf99854b31704e942653 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 21:30:29 +0800
Subject: [PATCH 10/30] cinnamon.cinnamon-settings-daemon: 5.6.2 -> 5.8.1

https://github.com/linuxmint/cinnamon-settings-daemon/compare/5.6.2...5.8.1
---
 .../cinnamon-settings-daemon/default.nix      |  5 ++--
 .../use-sane-install-dir.patch                | 27 -------------------
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch

diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
index 5f7ad87d83cb..9eb2d743d8e4 100644
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
@@ -32,18 +32,17 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-settings-daemon";
-  version = "5.6.2";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-IqYfHMjKe7gVsM6HgihQMNkcXSYBOft1lamXOLa1Y8k=";
+    hash = "sha256-2ObfUdrCuvyhtpoxNzoH8tsFQLxNkMLQPFfJajXEsXU=";
   };
 
   patches = [
     ./csd-backlight-helper-fix.patch
-    ./use-sane-install-dir.patch
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch
deleted file mode 100644
index d980431f81b9..000000000000
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From be57c01e6595a8e08ecc17de298e30640b532f11 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
-Date: Sat, 6 Feb 2021 13:55:03 +0100
-Subject: [PATCH] use sane install-dir
-
----
- meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 0e11d50..54f4637 100644
---- a/meson.build
-+++ b/meson.build
-@@ -156,8 +156,8 @@ subdir('cinnamon-settings-daemon')
- subdir('plugins')
- 
- install_subdir(
--    'files',
--    install_dir: '/',
-+    'files/usr',
-+    install_dir: get_option('prefix'),
-     strip_directory: true,
- )
- 
--- 
-2.30.0
-

From 51fec464f02e357efef729769f301422ae183efb Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 21:34:14 +0800
Subject: [PATCH 11/30] cinnamon.cinnamon-desktop: 5.6.2 -> 5.8.0

https://github.com/linuxmint/cinnamon-desktop/compare/5.6.2...5.8.0
---
 pkgs/desktops/cinnamon/cinnamon-desktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
index f5dfa0e36939..5e736ea1fdc8 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.2";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-X4jf7+QFjoev1K6ywxN0n9MYUv7xI1/su+hHeesG02Y=";
+    hash = "sha256-rYTWtdYfMow3cIPhJdcmhyaIIU7fgVecWigbsCW0Piw=";
   };
 
   outputs = [ "out" "dev" ];

From f0ef70e1a821bbb6ce7b853e2f514e1296e915df Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 21:35:42 +0800
Subject: [PATCH 12/30] cinnamon.cinnamon-translations: 5.6.1 -> 5.8.1

https://github.com/linuxmint/cinnamon-translations/compare/5.6.1...5.8.1
---
 pkgs/desktops/cinnamon/cinnamon-translations/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
index 09bf133a92a3..bbc098da8560 100644
--- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-translations";
-  version = "5.6.1";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-567xkQGLLhZtjAWXzW/MRiD14rrWeg0yvx97jtukRvc=";
+    hash = "sha256-QwLb8dxyub3W5KlYP1HinC07bTJ6f+/t07k3OWX9Qlg=";
   };
 
   nativeBuildInputs = [

From a72e1fda8488ad4fe6fd7189803593d7d279b283 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 21:37:02 +0800
Subject: [PATCH 13/30] cinnamon.cinnamon-session: 5.6.0 -> 5.8.1

https://github.com/linuxmint/cinnamon-session/compare/5.6.0...5.8.1
---
 pkgs/desktops/cinnamon/cinnamon-session/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix
index 90f760051bd5..51fa5bca3dd6 100644
--- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-session";
-  version = "5.6.0";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-lyASp0jFwaPLPQ3Jnow6eTpUBybwhSEmQUK/20fsh7I=";
+    hash = "sha256-NVoP1KYh/z96NKMi9LjL4RgkjJg32oSy5WHJ91+70DI=";
   };
 
   patches = [

From f92b997ab24ed5708c0f2407b3786978570283c2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 21:45:01 +0800
Subject: [PATCH 14/30] cinnamon.cinnamon-screensaver: 5.6.3 -> 5.8.0

https://github.com/linuxmint/cinnamon-screensaver/compare/5.6.3...5.8.0
---
 pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
index e6a615bb12af..c4cd8d9db02f 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.3";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-S4+9ZTpDwwvYTc3gz0YQBYjgygp8KP94azkiJcH6xCk=";
+    hash = "sha256-Y1veBgWTCs7HRBuMwN+eHu4oygGYIanaQigMGVfkSuI=";
   };
 
   nativeBuildInputs = [
@@ -89,8 +89,6 @@ stdenv.mkDerivation rec {
       -e s,/usr/share/cinnamon-screensaver,$out/share,g \
       -e s,/usr/share/iso-flag-png,${iso-flags-png-320x420}/share/iso-flags-png,g \
       {} +
-
-    sed "s|/usr/share/locale|/run/current-system/sw/share/locale|g" -i ./src/cinnamon-screensaver-main.py
   '';
 
   preFixup = ''

From 8e145212c76fbd2f44e73c7474c7e7f9889b53c1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 21:50:38 +0800
Subject: [PATCH 15/30] cinnamon.cinnamon-control-center: 5.6.1 -> 5.8.1

https://github.com/linuxmint/cinnamon-control-center/compare/5.6.1...5.8.1
---
 pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
index b3a16ed3fc35..fa282f0937ae 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.1";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-rp3K7SqGw8da2U61VjKiqUyT5vCUVk4XZdRYtLwRtfQ=";
+    hash = "sha256-tRLUdwEptLNngVq+qOPilGQipVXNeDlzohgu3VlVciI=";
   };
 
   buildInputs = [

From 5b962021f44e551d9dc460757c624d0ac1481378 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 21:59:35 +0800
Subject: [PATCH 16/30] cinnamon.nemo-emblems: 5.6.0 -> 5.8.0

https://github.com/linuxmint/nemo-extensions/compare/5.6.0...5.8.0
---
 .../cinnamon/nemo-extensions/nemo-emblems/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
index 33acf3e89753..9ae71d97976d 100644
--- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
+++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
@@ -5,7 +5,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nemo-emblems";
-  version = "5.6.0";
+  version = "5.8.0";
 
   format = "setuptools";
 
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "linuxmint";
     repo = "nemo-extensions";
     rev = version;
-    sha256 = "sha256-cxutiz5bc/dZ9D7XzvMWodWNYvNJPj+5IhJDPJwnb5I=";
+    sha256 = "sha256-tyRYPWJa93w05a0PcYvz1GA8/xX2kHLdIzz4tCcppiY=";
   };
 
   sourceRoot = "${src.name}/nemo-emblems";

From ddf80f1103108439380b5e59addb8e321283f048 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 22:00:50 +0800
Subject: [PATCH 17/30] cinnamon.nemo-fileroller: 5.6.1 -> 5.8.0

https://github.com/linuxmint/nemo-extensions/compare/nemo-fileroller-5.6.1...5.8.0
---
 .../cinnamon/nemo-extensions/nemo-fileroller/default.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix
index 7153ec0865c5..1b5717b2fd70 100644
--- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix
+++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nemo-fileroller";
-  version = "5.6.1";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo-extensions";
-    rev = "nemo-fileroller-${version}";
-    sha256 = "sha256-dPmAHuJ0ZRTAwhnMMZEu1e9+qZRYCnlaaoCdUP45W+s=";
+    rev = version;
+    sha256 = "sha256-tyRYPWJa93w05a0PcYvz1GA8/xX2kHLdIzz4tCcppiY=";
   };
 
   sourceRoot = "${src.name}/nemo-fileroller";

From a26bc72ff06bc9e915e49bbaa923604dab8a9785 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 22:01:57 +0800
Subject: [PATCH 18/30] cinnamon.nemo-python: 5.6.0 -> 5.8.0

https://github.com/linuxmint/nemo-extensions/compare/5.6.0...5.8.0
---
 .../desktops/cinnamon/nemo-extensions/nemo-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix
index bc43f2aa0848..a34b0a9eb5bc 100644
--- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix
+++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nemo-python";
-  version = "5.6.0";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "nemo-extensions";
     rev = version;
-    sha256 = "sha256-cxutiz5bc/dZ9D7XzvMWodWNYvNJPj+5IhJDPJwnb5I=";
+    sha256 = "sha256-tyRYPWJa93w05a0PcYvz1GA8/xX2kHLdIzz4tCcppiY=";
   };
 
   sourceRoot = "${src.name}/nemo-python";

From 067a8989e5ad1961f7b9c67a9464fda71328ad11 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 22:38:33 +0800
Subject: [PATCH 19/30] cinnamon.nemo-extensions: don't duplicate version and
 src

---
 .../nemo-extensions/nemo-emblems/default.nix      | 12 ++++--------
 .../nemo-extensions/nemo-fileroller/default.nix   | 12 ++++--------
 .../nemo-extensions/nemo-python/default.nix       | 12 ++++--------
 pkgs/desktops/cinnamon/nemo-extensions/srcs.nix   | 15 +++++++++++++++
 4 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/desktops/cinnamon/nemo-extensions/srcs.nix

diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
index 9ae71d97976d..d298827487e9 100644
--- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
+++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
@@ -3,19 +3,15 @@
 , fetchFromGitHub
 }:
 
+let
+  srcs = import ../srcs.nix { inherit fetchFromGitHub; };
+in
 python3.pkgs.buildPythonApplication rec {
   pname = "nemo-emblems";
-  version = "5.8.0";
+  inherit (srcs) version src;
 
   format = "setuptools";
 
-  src = fetchFromGitHub {
-    owner = "linuxmint";
-    repo = "nemo-extensions";
-    rev = version;
-    sha256 = "sha256-tyRYPWJa93w05a0PcYvz1GA8/xX2kHLdIzz4tCcppiY=";
-  };
-
   sourceRoot = "${src.name}/nemo-emblems";
 
   postPatch = ''
diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix
index 1b5717b2fd70..71c61db992a8 100644
--- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix
+++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix
@@ -10,16 +10,12 @@
 , gnome
 }:
 
+let
+  srcs = import ../srcs.nix { inherit fetchFromGitHub; };
+in
 stdenv.mkDerivation rec {
   pname = "nemo-fileroller";
-  version = "5.8.0";
-
-  src = fetchFromGitHub {
-    owner = "linuxmint";
-    repo = "nemo-extensions";
-    rev = version;
-    sha256 = "sha256-tyRYPWJa93w05a0PcYvz1GA8/xX2kHLdIzz4tCcppiY=";
-  };
+  inherit (srcs) version src;
 
   sourceRoot = "${src.name}/nemo-fileroller";
 
diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix
index a34b0a9eb5bc..8b6f5f07a1c3 100644
--- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix
+++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix
@@ -11,16 +11,12 @@
 , substituteAll
 }:
 
+let
+  srcs = import ../srcs.nix { inherit fetchFromGitHub; };
+in
 stdenv.mkDerivation rec {
   pname = "nemo-python";
-  version = "5.8.0";
-
-  src = fetchFromGitHub {
-    owner = "linuxmint";
-    repo = "nemo-extensions";
-    rev = version;
-    sha256 = "sha256-tyRYPWJa93w05a0PcYvz1GA8/xX2kHLdIzz4tCcppiY=";
-  };
+  inherit (srcs) version src;
 
   sourceRoot = "${src.name}/nemo-python";
 
diff --git a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix b/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix
new file mode 100644
index 000000000000..491373f5ea5f
--- /dev/null
+++ b/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix
@@ -0,0 +1,15 @@
+{ fetchFromGitHub }:
+
+rec {
+  # When you bump this, you should make sure all nemo-extensions
+  # are actually using this file since we try to deal with tags
+  # like nemo-fileroller-5.6.1 according to upstream's wishes.
+  version = "5.8.0";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = "nemo-extensions";
+    rev = version;
+    sha256 = "sha256-tyRYPWJa93w05a0PcYvz1GA8/xX2kHLdIzz4tCcppiY=";
+  };
+}

From c73f809c618f1fbc147c63d5980928167b2a1799 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 2 Jun 2023 13:11:45 +0800
Subject: [PATCH 20/30] cinnamon.nemo: 5.6.5 -> 5.8.2

https://github.com/linuxmint/nemo/compare/5.6.5...5.8.2
---
 pkgs/desktops/cinnamon/nemo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix
index 37da2ab231a0..18b2aff557ff 100644
--- a/pkgs/desktops/cinnamon/nemo/default.nix
+++ b/pkgs/desktops/cinnamon/nemo/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nemo";
-  version = "5.6.5";
+  version = "5.8.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-HdDe2VE9LQqiwFrUSIctOi/ffNOmLy6SyG30EL8UA5Q=";
+    sha256 = "sha256-Be67TOA1gLwSYx8y2iyfvY0QCpWOFutpXMDaPiTRQGg=";
   };
 
   patches = [

From ac5791cffb3b475ac5111fd7b73da94d1c61e67c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 2 Jun 2023 13:08:48 +0800
Subject: [PATCH 21/30] cinnamon.muffin: 5.6.4 -> 5.8.0

https://github.com/linuxmint/muffin/compare/5.6.4...5.8.0
---
 pkgs/desktops/cinnamon/muffin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix
index ba4eb95a5e95..20a350cb525d 100644
--- a/pkgs/desktops/cinnamon/muffin/default.nix
+++ b/pkgs/desktops/cinnamon/muffin/default.nix
@@ -35,7 +35,7 @@
 
 stdenv.mkDerivation rec {
   pname = "muffin";
-  version = "5.6.4";
+  version = "5.8.0";
 
   outputs = [ "out" "dev" "man" ];
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-NnQ7KF979HnsEc4X/Wf1YOfUvByHvVIdTAcJyUjhsp8=";
+    hash = "sha256-2pF6mKSSW4S0mfb4iBfZKBIVXKzrVyPeftcVrWSWzhc=";
   };
 
   patches = [

From 9447fa6d244de3cb35f917699e6c3bd86f328455 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 4 Jun 2023 18:31:10 +0800
Subject: [PATCH 22/30] cinnamon.cinnamon-common: 5.6.8 -> 5.8.2

https://github.com/linuxmint/cinnamon/compare/5.6.8...5.8.2
---
 pkgs/desktops/cinnamon/cinnamon-common/default.nix  | 5 +++--
 pkgs/desktops/cinnamon/cinnamon-common/libdir.patch | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index 0e33b9887ede..417cd6b717f6 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -72,13 +72,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cinnamon-common";
-  version = "5.6.8";
+  version = "5.8.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon";
     rev = version;
-    hash = "sha256-qL8GaEH/0d4yEwwdaR55fTp0RitbyptoxKOBO3nmbic=";
+    hash = "sha256-KY5ctByMYKxigiZ0X/blaHJuyiAUNB6B2gpGtC/k100=";
   };
 
   patches = [
@@ -166,6 +166,7 @@ stdenv.mkDerivation rec {
       substituteInPlace ./bin/SettingsWidgets.py          --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds"
       substituteInPlace ./bin/Spices.py                   --replace "msgfmt" "${gettext}/bin/msgfmt"
       substituteInPlace ./modules/cs_info.py              --replace "lspci" "${pciutils}/bin/lspci"
+      substituteInPlace ./modules/cs_themes.py            --replace "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d"
     popd
 
     sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d}
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch b/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch
index 7783d0b3ad12..bd15d658d81d 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch
+++ b/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch
@@ -17,6 +17,7 @@ index 3c1e9a4f..a77d9b3c 100644
  schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 -pkglibdir = join_paths(libdir, meson.project_name().to_lower())
 +pkglibdir = libdir
+ girdir = join_paths(datadir, 'gir-1.0')
  servicedir = join_paths(datadir, 'dbus-1', 'services')
  pkgdatadir = join_paths(datadir, meson.project_name().to_lower())
  po_dir = join_paths(meson.source_root(), 'po')

From 21b308be5f6a611c60f59c8d104889dd667f8785 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 4 Jun 2023 16:29:38 +0800
Subject: [PATCH 23/30] cinnamon.mint-themes: 2.0.9 -> 2.1.2

https://github.com/linuxmint/mint-themes/compare/2.0.9...2.1.2
---
 pkgs/desktops/cinnamon/mint-themes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix
index 4fa869a5ef31..ed7d011bc4f7 100644
--- a/pkgs/desktops/cinnamon/mint-themes/default.nix
+++ b/pkgs/desktops/cinnamon/mint-themes/default.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-themes";
-  version = "2.0.9";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-FvX4r7AZgSq52T9CKE9RagsKgQXExTYPptQBXadA3eI=";
+    hash = "sha256-Y+KmSKuREn2E3FySsScjL+oSpSFnyEqhoXQfU++86JY=";
   };
 
   nativeBuildInputs = [

From 503800b1fa0b7d4d4bed80dddbe9ff86f1d58fa3 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 4 Jun 2023 16:31:59 +0800
Subject: [PATCH 24/30] cinnamon.mint-y-icons: 1.6.5 -> 1.6.6

https://github.com/linuxmint/mint-y-icons/compare/1.6.5...1.6.6
---
 pkgs/desktops/cinnamon/mint-y-icons/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix
index b9d18280783e..01374a6f7ef6 100644
--- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix
+++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-y-icons";
-  version = "1.6.5";
+  version = "1.6.6";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-XnQcVlN4xtZQDjijNV09m2m0ODYfFbrQaNd8ZQVToIw=";
+    hash = "sha256-yLsFEd4QyeEBA4IrYiy0sgNv0kG9WxjFsJQteoJc+YM=";
   };
 
   propagatedBuildInputs = [

From ad38f06a3eb437b1833e2e32bdc028a46c2d3af8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 4 Jun 2023 16:33:39 +0800
Subject: [PATCH 25/30] cinnamon.mint-x-icons: 1.6.4 -> 1.6.5

https://github.com/linuxmint/mint-x-icons/compare/1.6.4...1.6.5
---
 pkgs/desktops/cinnamon/mint-x-icons/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix
index ada385afcea2..595fca6612fd 100644
--- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix
+++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix
@@ -11,13 +11,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-x-icons";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-cPRae3EjzVtAL1Ei2LB4UNUU/m87mFT94xY/NnNR6JM=";
+    hash = "sha256-Z07475Uiv4GKCOrKhDBXPZVBGpxdjN7vn2y0rRAZVm0=";
   };
 
   propagatedBuildInputs = [

From 74e7732dc31a0462282f8e2fd408ed31186dfad6 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 4 Jun 2023 22:24:40 +0800
Subject: [PATCH 26/30] cinnamon.pix: 2.8.9 -> 3.0.1

https://github.com/linuxmint/pix/compare/2.8.9...3.0.1
---
 pkgs/desktops/cinnamon/pix/default.nix | 105 ++++++++++++++++---------
 1 file changed, 67 insertions(+), 38 deletions(-)

diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix
index 0b02806e0579..0471a177a56e 100644
--- a/pkgs/desktops/cinnamon/pix/default.nix
+++ b/pkgs/desktops/cinnamon/pix/default.nix
@@ -1,70 +1,99 @@
 { stdenv
 , lib
+, fetchurl
 , fetchFromGitHub
-, autoreconfHook
-, cinnamon-desktop
-, file
-, gdk-pixbuf
-, glib
-, gobject-introspection
-, gtk-doc
-, gtk3
-, intltool
-, itstool
-, libtool
-, libxml2
 , pkg-config
-, shared-mime-info
-, wrapGAppsHook
-, xapp
-, yelp-tools
+, meson
+, ninja
+, exiv2
+, libheif
+, libjpeg
+, libtiff
+, gst_all_1
+, libraw
+, libsoup
 , libsecret
-, webkitgtk
-, libwebp
+, glib
+, gtk3
+, gsettings-desktop-schemas
 , librsvg
+, libwebp
 , json-glib
-, gnome
-, clutter
+, webkitgtk
+, lcms2
+, bison
+, flex
+, clutter-gtk
+, wrapGAppsHook
+, shared-mime-info
+, python3
+, desktop-file-utils
+, itstool
+, xapp
 }:
 
 stdenv.mkDerivation rec {
   pname = "pix";
-  version = "2.8.9";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-7g0j1cWgNtWlqKWzBnngUA2WNr8Zh8YO/jJ8OdTII7Y=";
+    sha256 = "sha256-sKmdJOuT4Ioy5DmWN9ly+9bqSn4frcVPD5qMTKtxtiQ=";
   };
 
   nativeBuildInputs = [
-    wrapGAppsHook
-    autoreconfHook
-    cinnamon-desktop
-    gdk-pixbuf
-    gnome.gnome-common
-    gobject-introspection
-    gtk-doc
-    intltool
+    bison
+    desktop-file-utils
+    flex
     itstool
-    libtool
+    meson
+    ninja
     pkg-config
-    yelp-tools
+    python3
+    wrapGAppsHook
   ];
 
   buildInputs = [
+    clutter-gtk
+    exiv2
     glib
+    gsettings-desktop-schemas
+    gst_all_1.gst-plugins-base
+    (gst_all_1.gst-plugins-good.override { gtkSupport = true; })
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-ugly
     gtk3
-    xapp
-    libsecret
-    webkitgtk
-    libwebp
-    librsvg
     json-glib
-    clutter
+    lcms2
+    libheif
+    libjpeg
+    libraw
+    librsvg
+    libsecret
+    libsoup
+    libtiff
+    libwebp
+    webkitgtk
+    xapp
   ];
 
+  postPatch = ''
+    chmod +x pix/make-pix-h.py
+
+    patchShebangs data/gschemas/make-enums.py \
+      pix/make-pix-h.py \
+      po/make-potfiles-in.py \
+      postinstall.py \
+      pix/make-authors-tab.py
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
+  '';
+
   meta = with lib; {
     description = "A generic image viewer from Linux Mint";
     homepage = "https://github.com/linuxmint/pix";

From 3dde9f36d8dc42a21f7022df584b5bb9d12a2259 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 5 Jun 2023 23:43:07 +0800
Subject: [PATCH 27/30] hypnotix: 3.2 -> 3.4

https://github.com/linuxmint/hypnotix/compare/3.2...3.4
---
 pkgs/applications/video/hypnotix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix
index ee62a711398b..a78f04ec01c7 100644
--- a/pkgs/applications/video/hypnotix/default.nix
+++ b/pkgs/applications/video/hypnotix/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hypnotix";
-  version = "3.2";
+  version = "3.4";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "hypnotix";
     rev = version;
-    hash = "sha256-R9bp1RQHHCrIE/3rIAHzWHXpXBUDUpJTkO53n+xZw3Q=";
+    hash = "sha256-Oxv70bFheKhlYyLdGcn0Hja+LAmn6RHfAh5FIjghD9o=";
   };
 
   patches = [

From bc559b4ca3bfbcc161cd484859a3c5651be1b710 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 20:10:11 +0800
Subject: [PATCH 28/30] nixos/cinnamon: install mint-l by default

This is part of Linux Mint 21.2.
---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index dbcfb25b2603..f736daa295c7 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -178,6 +178,8 @@ in
         nixos-artwork.wallpapers.simple-dark-gray
         mint-artwork
         mint-cursor-themes
+        mint-l-icons
+        mint-l-theme
         mint-themes
         mint-x-icons
         mint-y-icons

From 664601d8198875ca0a370feade7558dac8d7333a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 2 Jun 2023 21:43:52 +0800
Subject: [PATCH 29/30] nixos/cinnamon: enable switcherooControl by default

xapp-gpu-offload-helper looks for this.
---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index f736daa295c7..6a9378abaece 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -113,6 +113,7 @@ in
       services.gnome.glib-networking.enable = true;
       services.gnome.gnome-keyring.enable = true;
       services.gvfs.enable = true;
+      services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper
       services.udisks2.enable = true;
       services.upower.enable = mkDefault config.powerManagement.enable;
       services.xserver.libinput.enable = mkDefault true;

From 30d897c0ffeebb3c654f1a1a0a9eed4a6208a678 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 4 Jun 2023 16:27:53 +0800
Subject: [PATCH 30/30] nixos/cinnamon: enable touchegg by default

Needed for gesture support.
---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 6a9378abaece..c7755aca4bb5 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -114,6 +114,7 @@ in
       services.gnome.gnome-keyring.enable = true;
       services.gvfs.enable = true;
       services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper
+      services.touchegg.enable = mkDefault true;
       services.udisks2.enable = true;
       services.upower.enable = mkDefault config.powerManagement.enable;
       services.xserver.libinput.enable = mkDefault true;