From 01b5309bd527d5434ebaf252bdf0effd8f6cefa0 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 16 May 2024 20:40:41 +0530
Subject: [PATCH 1/2] fusuma: 3.3.1 -> 3.5.0

---
 pkgs/tools/inputmethods/fusuma/Gemfile.lock | 12 +++++----
 pkgs/tools/inputmethods/fusuma/gemset.nix   | 27 +++++++++++++++------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile.lock b/pkgs/tools/inputmethods/fusuma/Gemfile.lock
index 283d4c3fa5e1..b89e3c94971d 100644
--- a/pkgs/tools/inputmethods/fusuma/Gemfile.lock
+++ b/pkgs/tools/inputmethods/fusuma/Gemfile.lock
@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    fusuma (3.3.1)
-    fusuma-plugin-appmatcher (0.6.1)
+    fusuma (3.5.0)
+    fusuma-plugin-appmatcher (0.7.1)
       fusuma (>= 3.0)
       rexml
       ruby-dbus
-    fusuma-plugin-keypress (0.9.0)
+    fusuma-plugin-keypress (0.11.0)
       fusuma (>= 3.1)
     fusuma-plugin-sendkey (0.10.1)
       fusuma (>= 3.1)
@@ -14,9 +14,11 @@ GEM
     fusuma-plugin-wmctrl (1.3.1)
       fusuma (>= 3.1)
     revdev (0.2.1)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     ruby-dbus (0.23.1)
       rexml
+    strscan (3.1.0)
 
 PLATFORMS
   ruby
@@ -29,4 +31,4 @@ DEPENDENCIES
   fusuma-plugin-wmctrl
 
 BUNDLED WITH
-   2.4.22
+   2.5.9
diff --git a/pkgs/tools/inputmethods/fusuma/gemset.nix b/pkgs/tools/inputmethods/fusuma/gemset.nix
index 47d5f6215995..e5f895c4b74c 100644
--- a/pkgs/tools/inputmethods/fusuma/gemset.nix
+++ b/pkgs/tools/inputmethods/fusuma/gemset.nix
@@ -4,10 +4,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13pbvmkjriq6myynv4gfismiqa9y7bfbvvrfcv25670l4zyiakhm";
+      sha256 = "0vxlfda4mgff9kindrmr47xvn6b591hzvzzsx2y88zq20sn340vy";
       type = "gem";
     };
-    version = "3.3.1";
+    version = "3.5.0";
   };
   fusuma-plugin-appmatcher = {
     dependencies = ["fusuma" "rexml" "ruby-dbus"];
@@ -15,10 +15,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qkir4a657znq0fnx91lik7bw5kyq54jwhiy2zrlplln78xs5yai";
+      sha256 = "1cj3d1yz3jdxmapgk8wv5ra57nyb278x2fjxdllc0gqdfih6pxhq";
       type = "gem";
     };
-    version = "0.6.1";
+    version = "0.7.1";
   };
   fusuma-plugin-keypress = {
     dependencies = ["fusuma"];
@@ -26,10 +26,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0as95haqa943i740xs7czcaibb8lvy4gn6kr8nbldq20nly64bih";
+      sha256 = "16csdj695y9b8bvl65cby57fsyfr30pb9qq6h0wyqrxily6cn6il";
       type = "gem";
     };
-    version = "0.9.0";
+    version = "0.11.0";
   };
   fusuma-plugin-sendkey = {
     dependencies = ["fusuma" "revdev"];
@@ -64,14 +64,15 @@
     version = "0.2.1";
   };
   rexml = {
+    dependencies = ["strscan"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+      sha256 = "0d8ivcirrrxpkpjc1c835wknc9s2fl54xpw08s177yfrh5ish209";
       type = "gem";
     };
-    version = "3.2.6";
+    version = "3.2.8";
   };
   ruby-dbus = {
     dependencies = ["rexml"];
@@ -84,4 +85,14 @@
     };
     version = "0.23.1";
   };
+  strscan = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
+      type = "gem";
+    };
+    version = "3.1.0";
+  };
 }

From 2c16d7e8c123ab73eca88801c1ace0c430c12f27 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 16 May 2024 20:47:17 +0530
Subject: [PATCH 2/2] fusuma: move to pkgs/by-name

---
 pkgs/{tools/inputmethods => by-name/fu}/fusuma/Gemfile          | 0
 pkgs/{tools/inputmethods => by-name/fu}/fusuma/Gemfile.lock     | 0
 pkgs/{tools/inputmethods => by-name/fu}/fusuma/gemset.nix       | 0
 .../fusuma/default.nix => by-name/fu/fusuma/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{tools/inputmethods => by-name/fu}/fusuma/Gemfile (100%)
 rename pkgs/{tools/inputmethods => by-name/fu}/fusuma/Gemfile.lock (100%)
 rename pkgs/{tools/inputmethods => by-name/fu}/fusuma/gemset.nix (100%)
 rename pkgs/{tools/inputmethods/fusuma/default.nix => by-name/fu/fusuma/package.nix} (100%)

diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile b/pkgs/by-name/fu/fusuma/Gemfile
similarity index 100%
rename from pkgs/tools/inputmethods/fusuma/Gemfile
rename to pkgs/by-name/fu/fusuma/Gemfile
diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile.lock b/pkgs/by-name/fu/fusuma/Gemfile.lock
similarity index 100%
rename from pkgs/tools/inputmethods/fusuma/Gemfile.lock
rename to pkgs/by-name/fu/fusuma/Gemfile.lock
diff --git a/pkgs/tools/inputmethods/fusuma/gemset.nix b/pkgs/by-name/fu/fusuma/gemset.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fusuma/gemset.nix
rename to pkgs/by-name/fu/fusuma/gemset.nix
diff --git a/pkgs/tools/inputmethods/fusuma/default.nix b/pkgs/by-name/fu/fusuma/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fusuma/default.nix
rename to pkgs/by-name/fu/fusuma/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70c7e48a82bb..63ff7ce4bb40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8178,8 +8178,6 @@ with pkgs;
 
   fuseiso = callPackage ../tools/filesystems/fuseiso { };
 
-  fusuma = callPackage ../tools/inputmethods/fusuma { };
-
   fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { });
 
   inherit (fdbPackages)