gnu: kanata: Move to (gnu packages rust-apps).

* gnu/packages/kanata.scm: Delete file.
(rust-kanata-interception-0.3, rust-kanata-keyberon-0.180)
(rust-kanata-keyberon-macros-0.2, rust-kanata-parser-0.180)
(rust-kanata-tcp-protocol-0.180, rust-karabiner-driverkit-0.1): Delete
variables.
(kanata): Move to...
* gnu/packages/rust-apps.scm (kanata): ...here.
* gnu/local.mk (GNU_SYSTEM_MODULES): Unregisiter (gnu packages kanata).

Change-Id: I703d787f2ac9850c8a5eb275620cd50ccc4e6969

3 files changed, 26 insertions, 208 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index e3079b2a6ed..88c3cfe88e1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -419,7 +419,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/julia-jll.scm			\
   %D%/packages/julia-xyz.scm			\
   %D%/packages/jupyter.scm			\
-  %D%/packages/kanata.scm 			\
   %D%/packages/kawa.scm				\
   %D%/packages/kde.scm				\
   %D%/packages/kde-frameworks.scm		\
diff --git a/gnu/packages/kanata.scm b/gnu/packages/kanata.scm
deleted file mode 100644
index 41f42ef2d26..00000000000
--- a/gnu/packages/kanata.scm
+++ /dev/null
@@ -1,206 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2024 David Elsing <david.elsing@posteo.net>
-;;; Copyright © 2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages kanata)
-  #:use-module (guix build-system cargo)
-  #:use-module (guix download)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix gexp)
-  #:use-module (guix utils)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages crates-apple)
-  #:use-module (gnu packages crates-graphics)
-  #:use-module (gnu packages crates-io)
-  #:use-module (gnu packages crates-windows))
-
-(define-public rust-kanata-interception-0.3
-  (package
-    (name "rust-kanata-interception")
-    (version "0.3.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "kanata-interception" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "01mn1dskhm124x0nxfcw5cyb07h0i256x9bfj23aq6adjsdpprg2"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)
-                       ("rust-interception-sys" ,rust-interception-sys-0.1)
-                       ("rust-num-enum" ,rust-num-enum-0.6)
-                       ("rust-serde" ,rust-serde-1))))
-    (home-page "https://github.com/jtroo/kanata")
-    (synopsis "Safe wrapper for Interception, forked for use with Kanata")
-    (description
-     "This package provides a safe wrapper for Interception, forked for use
-with Kanata.")
-    (license (list license:expat license:asl2.0))))
-
-(define-public rust-kanata-keyberon-0.180
-  (package
-    (name "rust-kanata-keyberon")
-    (version "0.180.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "kanata-keyberon" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0iaz1nxsf523ajm8rm3im9q08jkswmv2b83cq6vfgy5mdzhi8zj3"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-arraydeque" ,rust-arraydeque-0.5)
-        ("rust-heapless" ,rust-heapless-0.7)
-        ("rust-kanata-keyberon-macros" ,rust-kanata-keyberon-macros-0.2)
-        ("rust-rustc-hash" ,rust-rustc-hash-1))))
-    (home-page "https://github.com/TeXitoi/keyberon")
-    (synopsis "Pure Rust keyboard firmware, forked for use with Kanata")
-    (description
-     "This package provides Pure Rust keyboard firmware, forked for use with
-Kanata.")
-    (license license:expat)))
-
-(define-public rust-kanata-keyberon-macros-0.2
-  (package
-    (name "rust-kanata-keyberon-macros")
-    (version "0.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "kanata-keyberon-macros" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0lj7ldiazmszh0k01h7mjzhjg59bdakvx2pnpc9mq2ir0czzixkk"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quote" ,rust-quote-1))))
-    (home-page "")
-    (synopsis "Macros for Keyberon, forked for Kanata project")
-    (description
-     "This package provides macros for Keyberon, forked for Kanata project.")
-    (license license:expat)))
-
-(define-public rust-kanata-parser-0.180
-  (package
-    (name "rust-kanata-parser")
-    (version "0.180.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "kanata-parser" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "02vwi5xj38yympavc7mygxiyky3153xnmwnpw4mdwvjwfsppxp1c"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
-                       ("rust-bitflags" ,rust-bitflags-2)
-                       ("rust-bytemuck" ,rust-bytemuck-1)
-                       ("rust-itertools" ,rust-itertools-0.12)
-                       ("rust-kanata-keyberon" ,rust-kanata-keyberon-0.180)
-                       ("rust-log" ,rust-log-0.4)
-                       ("rust-miette" ,rust-miette-5)
-                       ("rust-once-cell" ,rust-once-cell-1)
-                       ("rust-parking-lot" ,rust-parking-lot-0.12)
-                       ("rust-patricia-tree" ,rust-patricia-tree-0.8)
-                       ("rust-rustc-hash" ,rust-rustc-hash-1)
-                       ("rust-thiserror" ,rust-thiserror-1))))
-    (home-page "https://github.com/jtroo/kanata")
-    (synopsis "Parser for configuration language of Kanata")
-    (description
-     "This package provides a parser for configuration language of Kanata,
-a keyboard remapper.")
-    (license license:lgpl3)))
-
-(define-public rust-kanata-tcp-protocol-0.180
-  (package
-    (name "rust-kanata-tcp-protocol")
-    (version "0.180.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "kanata-tcp-protocol" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0nlilmw5x73xp1say99x1avrfkcski5fi9blnh3qilbxbv4350y7"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-serde" ,rust-serde-1)
-                       ("rust-serde-derive" ,rust-serde-derive-1)
-                       ("rust-serde-json" ,rust-serde-json-1))))
-    (home-page "https://github.com/jtroo/kanata")
-    (synopsis "TCP protocol for Kanata")
-    (description "This package provides TCP protocol for Kanata.")
-    (license license:lgpl3)))
-
-(define-public rust-karabiner-driverkit-0.1
-  (package
-    (name "rust-karabiner-driverkit")
-    (version "0.1.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "karabiner-driverkit" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32 "0pqnh9n3a8wxqzdj7d30f99g322da8zpnixsq5gfs9n1klccj380"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-cc" ,rust-cc-1)
-                       ("rust-os-info" ,rust-os-info-3))))
-    (home-page "https://github.com/Psych3r/driverkit")
-    (synopsis "Karabiner-DriverKit-VirtualHIDDevice wrapper for Kanata")
-    (description
-     "This package provides a minimal Karabiner-DriverKit-VirtualHIDDevice
-wrapper for Kanata.")
-    (license license:lgpl3)))
-
-(define-public kanata
-  (package
-    (name "kanata")
-    (version "1.8.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (crate-uri "kanata" version))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "1632iaclw9qy6sswm2wqapa28px7rdxqchk8b1wwp6k2scysr2bs"))))
-    (build-system cargo-build-system)
-    (arguments
-     (list #:install-source? #f))
-    (inputs (cargo-inputs 'kanata))
-    (home-page "https://github.com/jtroo/kanata")
-    (synopsis "Multi-layer keyboard customization")
-    (description
-     "Kanata is a keyboard re-mapper.  It supports multiple layers of key,
-and advanced key behavior customization, such as tap-hold, macros and
-Unicode.")
-    (license license:lgpl3)))
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 43e74b15fbb..0051c5d73a5 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
-;;; Copyright © 2020-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.ccom>
@@ -37,6 +37,7 @@
 ;;; Copyright © 2025 Divya Ranjan Pattanaik <divya@subvertising.org>
 ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.com>
 ;;; Copyright © 2024 Danny Milosavljevic <dannym@friendly-machines.com>
+;;; Copyright © 2024 David Elsing <david.elsing@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2344,6 +2345,30 @@ bar.  It is also compatible with sway.")
 @code{just} is a handy way to save and run project-specific commands.")
     (license license:cc0)))
 
+(define-public kanata
+  (package
+    (name "kanata")
+    (version "1.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "kanata" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1632iaclw9qy6sswm2wqapa28px7rdxqchk8b1wwp6k2scysr2bs"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list #:install-source? #f))
+    (inputs (cargo-inputs 'kanata))
+    (home-page "https://github.com/jtroo/kanata")
+    (synopsis "Multi-layer keyboard customization")
+    (description
+     "Kanata is a keyboard re-mapper.  It supports multiple layers of key,
+and advanced key behavior customization, such as tap-hold, macros and
+Unicode.")
+    (license license:lgpl3)))
+
 (define-public kibi
   (package
     (name "kibi")