[bug#73341] [PATCH 1/4] services: Extend udev rules in joycond-service-type.

[bug#73341] [PATCH 1/4] services: Extend udev rules in joycond-service-type.

[Maxim Cournoyer]

* gnu/services/games.scm (joycond-service-type): Also extend the udev service
with the configured joycond package.
* doc/guix.texi (Game Services): Update documentation.

Change-Id: I9f7fb0da5cfc1f8a7e8bb5f2ce7161e5e66b2f5e
---
 doc/guix.texi          | 6 +++++-
 gnu/services/games.scm | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index bc4d306c2d..d63b57300f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -39353,6 +39353,7 @@ Game Services
 
 @subsubheading Joycond service
 @cindex joycond
+@cindex nintendo controllers
 The joycond service allows the pairing of Nintendo joycon game
 controllers over Bluetooth. (@pxref{Desktop Services} for setting up
 Bluetooth.)
@@ -39367,7 +39368,10 @@ Game Services
 @end deftp
 
 @defvar joycond-service-type
-Service type for the joycond service.
+Service type for the joycond service.  It also extends the
+@code{udev-service-type} with the @code{joycond} package (provided via
+the @code{joycond-configuration} configuration), so that joycond
+controllers can be detected and used by an unprivileged user.
 @end defvar
 
 @subsubheading The Battle for Wesnoth Service
diff --git a/gnu/services/games.scm b/gnu/services/games.scm
index e63c1c1299..2557b82bec 100644
--- a/gnu/services/games.scm
+++ b/gnu/services/games.scm
@@ -23,6 +23,7 @@ (define-module (gnu services games)
   #:use-module (gnu services shepherd)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages games)
+  #:use-module ((gnu services base) #:select (udev-service-type))
   #:use-module (gnu system shadow)
   #:use-module ((gnu system file-systems) #:select (file-system-mapping))
   #:use-module (gnu build linux-container)
@@ -61,10 +62,13 @@ (define joycond-service-type
   (service-type
    (name 'joycond)
    (description
-    "Run @command{joycond} for pairing Nintendo joycons via Bluetooth.")
+    "Run @command{joycond} for pairing Nintendo joycons via Bluetooth and
+install udev rules required to use the controller as an unprivileged user.")
    (extensions
     (list (service-extension shepherd-root-service-type
-                             joycond-shepherd-service)))
+                             joycond-shepherd-service)
+          (service-extension udev-service-type
+                             (compose list joycond-configuration-package))))
    (default-value (joycond-configuration))))
 
 \f

base-commit: 8dae6b47542b906682f83b06b0478fcbd0776fd6
-- 
2.46.0

[bug#73342] [PATCH 2/4] gnu: Add tinycmmc.

[Maxim Cournoyer]

* gnu/packages/cmake.scm (tinycmmc): New variable.

Change-Id: Ie3a4e04f1ab3fb3ad6b6825f371d233a4ee905e2
---
 gnu/packages/cmake.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index ac75321937..0a9e5ba907 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -499,3 +499,24 @@ (define-public qmsetup
 @item Support calling Qt Linguist Tools via CMake conveniently
 @end itemize")
       (license license:expat))))
+
+(define-public tinycmmc
+  (package
+    (name "tinycmmc")
+    (version "0.1.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/Grumbel/tinycmmc")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0chv7h6vnd8zpa6b69krxwdgvp3n5fd37355wa1zwi14x4nyyay5"))))
+    (build-system cmake-build-system)
+    (arguments (list #:tests? #f))      ;no test suite
+    (home-page "https://github.com/Grumbel/tinycmmc")
+    (synopsis "Tiny CMake Module Collections")
+    (description "The tinycmmc package contains a small collection of reusable
+CMake modules.")
+    (license license:zlib)))
-- 
2.46.0

[bug#73343] [PATCH 3/4] gnu: Add evtest-qt.

[Maxim Cournoyer]

* gnu/packages/games.scm (evtest-qt): New variable.

Change-Id: Ifccb54509b4469c923126b100094e06e93383208
---
 gnu/packages/games.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 213c4c598d..03cd322b47 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9843,6 +9843,30 @@ (define-public flightgear
 simulator.")
     (license license:gpl2+)))
 
+(define-public evtest-qt
+  (package
+    (name "evtest-qt")
+    (version "0.2.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/Grumbel/evtest-qt")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1wfzkgq81764qzxgk0y5vvpxcrb3icvrr4dd4mj8njrqgbwmn0mw"))))
+    (build-system cmake-build-system)
+    (arguments (list #:tests? #f))      ;no test suite
+    (native-inputs (list tinycmmc))
+    (inputs (list qtbase-5))
+    (home-page "https://github.com/Grumbel/evtest-qt")
+    (synopsis "Evdev Joystick Tester")
+    (description "@command{evtest-qt} is a simple joystick tester for devices
+using the @code{evdev} generic input event interface.  It provides a list of
+attached joysticks and displays which buttons and axis are pressed.")
+    (license license:gpl3+)))
+
 (define-public jstest-gtk
   ;; There is no recent tagged release; use the latest commit.
   (let ((commit "60fe6ebdbc6719945be3f04988667dea569085be")
-- 
2.46.0

[bug#73344] [PATCH 4/4] gnu: jstest-gtk: Mention this is for joydev devices in description.

[Maxim Cournoyer]

* gnu/packages/games.scm (jstest-gtk) [synopsis]: Mention this is for Joydev
joysticks.
[description]: Likewise.

Change-Id: I3a93a237ea5e2efb6bc49e6a9eee2e8714e25bf5
---
 gnu/packages/games.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 03cd322b47..a2f421a51e 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9888,11 +9888,12 @@ (define-public jstest-gtk
       (native-inputs (list pkg-config))
       (inputs (list gtkmm-3 libsigc++-2))
       (home-page "https://github.com/Grumbel/jstest-gtk/")
-      (synopsis "Simple joystick tester GUI")
+      (synopsis "Joydev Joystick Tester")
       (description "@command{jstest-gtk} is a simple joystick tester based on
-GTK.  It provides a list of attached joysticks, a way to display which buttons
-and axis are pressed, a way to remap axis and buttons and a way to calibrate
-joysticks.")
+GTK, for testing devices using the older @code{joydev} Linux joystick
+@acronym{API, Application Programming Interface}.  It provides a list of
+attached joysticks, a way to display which buttons and axis are pressed, a way
+to remap axis and buttons and a way to calibrate joysticks.")
       (license license:gpl3+))))
 
 (define-public jumpnbump
-- 
2.46.0

[bug#73344] [PATCH 4/4] gnu: jstest-gtk: Mention this is for joydev devices in description.

[Liliana Marie Prikler]

Am Donnerstag, dem 19.09.2024 um 10:02 +0900 schrieb Maxim Cournoyer:
> * gnu/packages/games.scm (jstest-gtk) [synopsis]: Mention this is for
> Joydev
> joysticks.
> [description]: Likewise.
> 
> Change-Id: I3a93a237ea5e2efb6bc49e6a9eee2e8714e25bf5
> ---
LGTM

[bug#73343] [PATCH 3/4] gnu: Add evtest-qt.

[Liliana Marie Prikler]

Am Donnerstag, dem 19.09.2024 um 10:02 +0900 schrieb Maxim Cournoyer:
> * gnu/packages/games.scm (evtest-qt): New variable.
> 
> Change-Id: Ifccb54509b4469c923126b100094e06e93383208
> ---
Lexically LGTM, haven't tested, though.

Note, that this and 4/4 have different bug IDs – I suppose you sent
several patches that were meant to be a (loose?) series.

Cheers

bug#73343: [PATCH 3/4] gnu: Add evtest-qt.

[Maxim Cournoyer]

Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Donnerstag, dem 19.09.2024 um 10:02 +0900 schrieb Maxim Cournoyer:
>> * gnu/packages/games.scm (evtest-qt): New variable.
>> 
>> Change-Id: Ifccb54509b4469c923126b100094e06e93383208
>> ---
> Lexically LGTM, haven't tested, though.
>
> Note, that this and 4/4 have different bug IDs – I suppose you sent
> several patches that were meant to be a (loose?) series.

Yes, this was meant to be a loose series. I've now pushed this one as
55db928dcb as well as tinycmmc which it depended on.

-- 
Thanks,
Maxim

bug#73344: [PATCH 4/4] gnu: jstest-gtk: Mention this is for joydev devices in description.

[Maxim Cournoyer]

Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Donnerstag, dem 19.09.2024 um 10:02 +0900 schrieb Maxim Cournoyer:
>> * gnu/packages/games.scm (jstest-gtk) [synopsis]: Mention this is for
>> Joydev
>> joysticks.
>> [description]: Likewise.
>> 
>> Change-Id: I3a93a237ea5e2efb6bc49e6a9eee2e8714e25bf5
>> ---
> LGTM

Pushed as b7c94d5288 (sorry, I just noticed I forget to add the
Reviewed-by tags).

-- 
Thanks,
Maxim