From cfe15f8af9c9cf4e9d00779b95a9af069dd2393b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 5 Jun 2024 21:40:03 +0800
Subject: [PATCH 1/3] Revert "python3Packages.xapp: 21 -> 22"

This reverts commit b0913a5ee1d18bf885ebe67e3224a2492af8b3f6.

The master.* tags are not stable tags and can be re-tagged.
---
 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 c1f1973957de..4f45ab5a5408 100644
--- a/pkgs/development/python-modules/xapp/default.nix
+++ b/pkgs/development/python-modules/xapp/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "xapp";
-  version = "22";
+  version = "21";
 
   format = "other";
 
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "linuxmint";
     repo = "python-xapp";
     rev = "refs/tags/master.mint${version}";
-    hash = "sha256-2Gx85y0ARu6EfDYAT9ZL154RH0R1HY78tm3rceODnZU=";
+    hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o=";
   };
 
   nativeBuildInputs = [

From 33c2a871a243670387f5c22618abe789f6b7a9c6 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 5 Jun 2024 21:40:13 +0800
Subject: [PATCH 2/3] Revert "python3Packages.xapp: 2.4.1 -> 21"

This reverts commit 458c58145981871a02e03692e1663441acbfae9e.

The master.* tags are not stable tags and can be re-tagged.
---
 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 4f45ab5a5408..9d1e8b124b6d 100644
--- a/pkgs/development/python-modules/xapp/default.nix
+++ b/pkgs/development/python-modules/xapp/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "xapp";
-  version = "21";
+  version = "2.4.1";
 
   format = "other";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "python-xapp";
-    rev = "refs/tags/master.mint${version}";
+    rev = version;
     hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o=";
   };
 

From 3182dcecd7e567b07d91df716d0bf040f3a80683 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 5 Jun 2024 21:42:04 +0800
Subject: [PATCH 3/3] python3Packages.xapp: Skip bulk update

This should be bumped as part of Cinnamon update.
---
 pkgs/development/python-modules/xapp/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix
index 9d1e8b124b6d..ba55391ca66f 100644
--- a/pkgs/development/python-modules/xapp/default.nix
+++ b/pkgs/development/python-modules/xapp/default.nix
@@ -55,7 +55,10 @@ buildPythonPackage rec {
   doCheck = false;
   pythonImportsCheck = [ "xapp" ];
 
-  passthru.updateScript = gitUpdater { ignoredVersions = "^master.*"; };
+  passthru = {
+    updateScript = gitUpdater { ignoredVersions = "^master.*"; };
+    skipBulkUpdate = true; # This should be bumped as part of Cinnamon update.
+  };
 
   meta = with lib; {
     homepage = "https://github.com/linuxmint/python-xapp";