Re: [PATCH 2/2] services: Add 'lirc-service'.

[Alex Kost <alezost@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 625 bytes --]

Ludovic Courtès (2015-03-24 10:15 +0100) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> From 3b7641e31cefca68a6d477d14e0f3b3da1610e53 Mon Sep 17 00:00:00 2001
>> From: Alex Kost <alezost@gmail.com>
>> Date: Sun, 22 Mar 2015 16:33:17 +0300
>> Subject: [PATCH 2/2] services: Add 'lirc-service'.
>>
>> * gnu/services/lirc.scm: New file.
>> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
>
> LGTM.  Could you add the documentation under “Services” in the manual
> (maybe create a “Various Services” subsection or something like that.)

OK, the updated patch (with the documentation) is attached.


[-- Attachment #2: 0002-services-Add-lirc-service.patch --]
[-- Type: text/x-diff, Size: 5345 bytes --]

From 6338f01cf706a755632b0647d3e0b41062c070a1 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Sun, 22 Mar 2015 16:33:17 +0300
Subject: [PATCH 2/2] services: Add 'lirc-service'.

* gnu/services/lirc.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
* doc/guix.texi (Various Services): New node.  Document 'lirc-service'.
---
 doc/guix.texi         | 21 ++++++++++++++++
 gnu-system.am         |  1 +
 gnu/services/lirc.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 gnu/services/lirc.scm

diff --git a/doc/guix.texi b/doc/guix.texi
index 1736503..e9f95a0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -154,6 +154,7 @@ Services
 * Base Services::               Essential system services.
 * Networking Services::         Network setup, SSH daemon, etc.
 * X Window::                    Graphical display.
+* Various Services::            Other services.
 
 Packaging Guidelines
 
@@ -4350,6 +4351,7 @@ declaration.
 * Base Services::               Essential system services.
 * Networking Services::         Network setup, SSH daemon, etc.
 * X Window::                    Graphical display.
+* Various Services::            Other services.
 @end menu
 
 @node Base Services
@@ -4686,6 +4688,25 @@ appropriate screen resolution; otherwise, it must be a list of
 resolutions---e.g., @code{((1024 768) (640 480))}.
 @end deffn
 
+@node Various Services
+@subsubsection Various Services
+
+The @code{(gnu services lirc)} module provides the following service.
+
+@deffn {Monadic Procedure} lirc-service [#:lirc lirc] @
+       [#:device #f] [#:driver #f] [#:config-file #f] @
+       [#:extra-options '()]
+Return a service that runs @url{http://www.lirc.org,LIRC}, a daemon that
+decodes IR signals from remote controls.
+
+Optionally, @var{device}, @var{driver} and @var{config-file} (a path to
+configuration file) may be specified.  See @command{lircd} manual for
+details.
+
+Finally, @var{extra-options} is a list of additional command-line options
+passed to @command{lircd}.
+@end deffn
+
 @node Setuid Programs
 @subsection Setuid Programs
 
diff --git a/gnu-system.am b/gnu-system.am
index c8c51f1..49c098e 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -323,6 +323,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/services/base.scm				\
   gnu/services/dbus.scm				\
   gnu/services/dmd.scm				\
+  gnu/services/lirc.scm				\
   gnu/services/networking.scm			\
   gnu/services/ssh.scm				\
   gnu/services/xorg.scm				\
diff --git a/gnu/services/lirc.scm b/gnu/services/lirc.scm
new file mode 100644
index 0000000..03f3709
--- /dev/null
+++ b/gnu/services/lirc.scm
@@ -0,0 +1,68 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
+;;;
+;;; 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 services lirc)
+  #:use-module (gnu services)
+  #:use-module (gnu packages lirc)
+  #:use-module (guix monads)
+  #:use-module (guix store)
+  #:use-module (guix gexp)
+  #:export (lirc-service))
+
+;;; Commentary:
+;;;
+;;; LIRC services.
+;;;
+;;; Code:
+
+(define* (lirc-service #:key (lirc lirc)
+                       device driver config-file
+                       (extra-options '()))
+  "Return a service that runs @url{http://www.lirc.org,LIRC}, a daemon that
+decodes IR signals from remote controls.
+
+The daemon will use specified @var{device}, @var{driver} and
+@var{config-file} (a path to configuration file).
+
+Finally, @var{extra-options} is a list of additional command-line options
+passed to @command{lircd}."
+  (with-monad %store-monad
+    (return
+     (service
+      (provision '(lircd))
+      (documentation "Run the LIRC daemon.")
+      (requirement '(user-processes))
+      (start #~(make-forkexec-constructor
+                (list (string-append #$lirc "/sbin/lircd")
+                      "--nodaemon"
+                      #$@(if device
+                             #~("--device" #$device)
+                             #~())
+                      #$@(if driver
+                             #~("--driver" #$driver)
+                             #~())
+                      #$@(if config-file
+                             #~(#$config-file)
+                             #~())
+                      #$@extra-options)))
+      (stop #~(make-kill-destructor))
+      (activate #~(begin
+                    (use-modules (guix build utils))
+                    (mkdir-p "/var/run/lirc")))))))
+
+;;; lirc.scm ends here
-- 
2.3.2