From 8cd5cc810478827611919b506381135b821c288f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 19:43:49 +0800
Subject: [PATCH 1/4] cinnamon.warpinator: 1.6.1 -> 1.6.2

https://github.com/linuxmint/warpinator/compare/1.6.1...1.6.2
---
 pkgs/desktops/cinnamon/warpinator/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix
index fbf5df1fc7ce..6f70d8f9bda7 100644
--- a/pkgs/desktops/cinnamon/warpinator/default.nix
+++ b/pkgs/desktops/cinnamon/warpinator/default.nix
@@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "warpinator";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-H8bFSgx3IysHCoKrMZ9gbwRl9forEjY90a/PIC68E6k=";
+    hash = "sha256-crGW1FBfTEiKqx981EzG414we4icyBv/keGtMlr8UFc=";
   };
 
   nativeBuildInputs = [
@@ -77,11 +77,6 @@ stdenv.mkDerivation rec {
       --replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \
       --replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \
       --replace 'GLib.find_program_in_path("bwrap")' "True"
-
-    # Typo fix that can be removed on next update
-    # https://github.com/linuxmint/warpinator/pull/174
-    substituteInPlace src/remote.py \
-      --replace "receiver.remaining_count" "op.remaining_count"
   '';
 
   passthru.updateScript = gitUpdater {

From 436bd2bf7aef489cc240047583481ac8ee4fbd8c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 18:46:28 +0800
Subject: [PATCH 2/4] python310Packages.xapp: 2.4.0 -> 2.4.1

https://github.com/linuxmint/python3-xapp/compare/2.4.0...2.4.1
---
 pkgs/development/python-modules/xapp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix
index 9613ccbeb06d..cc8e3b62c45b 100644
--- a/pkgs/development/python-modules/xapp/default.nix
+++ b/pkgs/development/python-modules/xapp/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "xapp";
-  version = "2.4.0";
+  version = "2.4.1";
 
   format = "other";
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "linuxmint";
     repo = "python-xapp";
     rev = version;
-    hash = "sha256-qEK71cGNGmaThxlFVsfnLUTD83RTr8GP+501c4UbHCk=";
+    hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o=";
   };
 
   nativeBuildInputs = [

From 7cf3428fd58304599f7fb139d8b20c5dde7dca3c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 2 Jun 2023 11:40:09 +0800
Subject: [PATCH 3/4] nixos/cinnamon: fix slick-greeter icon theme package
 default

---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 9adbcec7f2f0..7ced5b63c839 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -70,9 +70,9 @@ in
           name = mkDefault "Mint-Y-Aqua";
           package = mkDefault pkgs.cinnamon.mint-themes;
         };
-        iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-x-icons) {
+        iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-y-icons) {
           name = mkDefault "Mint-Y-Aqua";
-          package = mkDefault pkgs.cinnamon.mint-x-icons;
+          package = mkDefault pkgs.cinnamon.mint-y-icons;
         };
         cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) {
           name = mkDefault "Bibata-Modern-Classic";

From 9f5dc9f927a9d45ff7cf96459a02e9a3908c2f4f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 1 Jun 2023 20:53:06 +0800
Subject: [PATCH 4/4] nixos/tests/cinnamon: silence a warning and remove unused
 args

Module argument `nodes.machine.config` is deprecated. Use `nodes.machine` instead.
---
 nixos/tests/cinnamon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix
index e455d96c4fb0..2a1389231904 100644
--- a/nixos/tests/cinnamon.nix
+++ b/nixos/tests/cinnamon.nix
@@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
 
   meta.maintainers = lib.teams.cinnamon.members;
 
-  nodes.machine = { nodes, ... }: {
+  nodes.machine = { ... }: {
     imports = [ ./common/user-account.nix ];
     services.xserver.enable = true;
     services.xserver.desktopManager.cinnamon.enable = true;
@@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
 
   testScript = { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
       uid = toString user.uid;
       bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
       display = "DISPLAY=:0.0";