From patchwork Sun Apr 17 10:01:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 38619 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AE18A27BBEA; Sun, 17 Apr 2022 11:04:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 48A1827BBE9 for ; Sun, 17 Apr 2022 11:04:24 +0100 (BST) Received: from localhost ([::1]:54850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ng1lX-0000yd-2A for patchwork@mira.cbaines.net; Sun, 17 Apr 2022 06:04:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ng1lC-0000yH-UN for guix-patches@gnu.org; Sun, 17 Apr 2022 06:04:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ng1lC-00009d-E2 for guix-patches@gnu.org; Sun, 17 Apr 2022 06:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ng1lC-00006i-A1 for guix-patches@gnu.org; Sun, 17 Apr 2022 06:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54986] [PATCH] gnu: mpd: Add support for socket activation. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Apr 2022 10:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54986 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54986@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1650189840402 (code B ref -1); Sun, 17 Apr 2022 10:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Apr 2022 10:04:00 +0000 Received: from localhost ([127.0.0.1]:34993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ng1l9-00006P-NY for submit@debbugs.gnu.org; Sun, 17 Apr 2022 06:03:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:42376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ng1l8-00006I-4t for submit@debbugs.gnu.org; Sun, 17 Apr 2022 06:03:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ng1l1-0000xz-2C for guix-patches@gnu.org; Sun, 17 Apr 2022 06:03:53 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:36673) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ng1ky-00007A-HI for guix-patches@gnu.org; Sun, 17 Apr 2022 06:03:49 -0400 Received: by mail-ed1-x541.google.com with SMTP id u18so14652331eda.3 for ; Sun, 17 Apr 2022 03:03:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=mGiY5r+/zrnr75rG4wVqhLDFOdMCk5a8HGj+r9Jazyc=; b=dxsZCfVdsQ9LWhNsWJGsSMgXp6wJeUNSkPk5ATcGxiKQe0uRRgp3sKeLrictPAtJ/C xDOIsKuxG/YMu4FRbc5QKmG10lsnbYFb3GxBwodC32mmKfB/oACnTrZvaCokV9X1Bzhb VebkjqzCaepiIzMDystHsEXKdY/bm9ziTPUZcpaC0dsC/g/WAVh72XBASRIkyVt610zt ECxOvZIVrSzsjbpClZ+GMy/k7bT9PkPui3YpoGYzGSZYpsTeRYoi4BTxbusz7VgReMd0 B/4RlVt8XUGyvKOJ+BZZn5ENOy/3LAPXhl9moZVKmdI/bGyduYvh00JdlTBOJj5lLm1c RUyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=mGiY5r+/zrnr75rG4wVqhLDFOdMCk5a8HGj+r9Jazyc=; b=iBqU6jg6NtJIEo5+9JGSLt2/Fb5kghBce70xqcFf0dIer9LzBva+2Rs175pHnzJRuV WQCn+p9hIZwprHZSYcu31SNxsEtv2hipGLScv7JalneOv3RIBDoNAb8T3tbkb/6ATElE Jnwc+QQdSX0hjccN3wmLNx2uLhk3SV7A3id9e7n5vckGY4CNQw9CRMgL3nqx74d/1KCN dwlAp0OfN8jdAzVxQ0BtGr4aFnkv1LQ9sl48KOSFdyI0Tix9ftGF0BOlQl7LKmycFnxS PL+GQZlczfkHLYAfIawsez5JBYnQLl5kNzqM/2pZixTfbM6dJW8auSA/Ine+5OR2wOU8 11lw== X-Gm-Message-State: AOAM533yX+U5VV/0Cb2MrkyrcrjsXOgPRkJMWHb5p8LzV5QoMv6mSn1H mgJJi7ttO5z3bO0AqNdlvofZyLJaJj8= X-Google-Smtp-Source: ABdhPJwjroGMd/GfwGRJz9brUckyy3zDr2HfZXid02wgzs0sFNr1iE0yRivXllWLaUi8y3k19aG8hg== X-Received: by 2002:a05:6402:3713:b0:41d:96f6:8a09 with SMTP id ek19-20020a056402371300b0041d96f68a09mr7279448edb.136.1650189825789; Sun, 17 Apr 2022 03:03:45 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id cq24-20020a056402221800b00420ad7d2dd0sm5421086edb.29.2022.04.17.03.03.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 03:03:45 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 17 Apr 2022 12:01:47 +0200 MIME-Version: 1.0 Message-ID: <9d4cc9d3ebb05d2aabf8f06e1890efe9b0b9a849.camel@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=liliana.prikler@gmail.com; helo=mail-ed1-x541.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mpd.scm (mpd)[#:configure-flags]: Convert to G-Expression. Add “-Dsystemd=enabled”. [#:phases]: New argument. [inputs]: Add elogind. --- gnu/packages/mpd.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 1ee6806735..40e6a99ad7 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -47,6 +47,7 @@ (define-module (gnu packages mpd) #:use-module (gnu packages boost) #:use-module (gnu packages cdrom) #:use-module (gnu packages cmake) ;for MPD + #:use-module (gnu packages freedesktop) ;elogind #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -119,12 +120,28 @@ (define-public mpd "1v969w7h3660ph3h2bdlkrzc05pfz95bmxjqdbzzf7pfwf795ifb")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Ddocumentation=enabled"))) + (list + #:configure-flags #~(list "-Ddocumentation=enabled" + "-Dsystemd=enabled") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'enable-elogind + (lambda _ + (substitute* "src/lib/systemd/meson.build" + (("libsystemd") "libelogind")) + ;; XXX: systemd dependency overwritten internally, leads to bad + ;; errors + (substitute* "src/lib/systemd/meson.build" + (("systemd_dep = declare_dependency" all) + (string-append "_" all))) + (substitute* "meson.build" + (("systemd_dep,") "systemd_dep, _systemd_dep,"))))))) (inputs (list ao alsa-lib avahi boost curl + elogind ffmpeg flac fmt From patchwork Sat Apr 23 14:25:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 38770 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2862A27BBEA; Sat, 23 Apr 2022 18:07:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9D90227BBE9 for ; Sat, 23 Apr 2022 18:07:12 +0100 (BST) Received: from localhost ([::1]:42268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niJDz-0005Rx-O2 for patchwork@mira.cbaines.net; Sat, 23 Apr 2022 13:07:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1niJDr-0005QF-85 for guix-patches@gnu.org; Sat, 23 Apr 2022 13:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1niJDq-0008VT-Ty for guix-patches@gnu.org; Sat, 23 Apr 2022 13:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1niJDq-00074e-Po for guix-patches@gnu.org; Sat, 23 Apr 2022 13:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54986] [PATCH v2 2/3 WIP] services: shepherd: Add support for socket activation endpoints. References: <9d4cc9d3ebb05d2aabf8f06e1890efe9b0b9a849.camel@gmail.com> In-Reply-To: <9d4cc9d3ebb05d2aabf8f06e1890efe9b0b9a849.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Apr 2022 17:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54986 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54986@debbugs.gnu.org Cc: ludo@gnu.org Received: via spool by 54986-submit@debbugs.gnu.org id=B54986.165073360927153 (code B ref 54986); Sat, 23 Apr 2022 17:07:02 +0000 Received: (at 54986) by debbugs.gnu.org; 23 Apr 2022 17:06:49 +0000 Received: from localhost ([127.0.0.1]:57143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niJDd-00073n-04 for submit@debbugs.gnu.org; Sat, 23 Apr 2022 13:06:49 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:42576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niJDZ-000737-4t for 54986@debbugs.gnu.org; Sat, 23 Apr 2022 13:06:45 -0400 Received: by mail-ej1-f67.google.com with SMTP id i27so21913264ejd.9 for <54986@debbugs.gnu.org>; Sat, 23 Apr 2022 10:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=seEX2LEgzCZY4UiCqrYu/PjKLIwGvoXWcSeGOBa8kjQ=; b=LQapge+1rJWCtnqHF8/oLxQv75/bMT6hl5l/iEvbj8VRTlajj1qHr/Tu5oYT64/BgP JK1UqYW1mBgRBbm/rLN+IjO2sCVD6bfIV4l/JEuQUZeEU8b54OHW64bxik5T8EeBtWom HzXTi64C8ScZpxRmKyASKHzBRtZ2N+GdBVZHiid73ktqTnazYaYqPY2J4CKjSNqskm17 4misr7sl70Y+QhnV3u3Mq/xsD/2FamSQQ8mOVhNzFEnOD2X6gZxB4ZRr+HWlbHyNIfRk r+cPj7HpIeEFtGT28PoCFjGYZDwTbQ1Ieeyn2g/4iKPIFQOu2Tg5u2Tcub2glfkOoodA hf4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:cc :content-transfer-encoding:message-id:mime-version; bh=seEX2LEgzCZY4UiCqrYu/PjKLIwGvoXWcSeGOBa8kjQ=; b=d9cxxzLYt20H1OBj5x6QzimeEMuzujp86MeSdOtMZuXzXNf7iToazlYIL7qll21ca8 GGyXOy3Mh67cLF0JpjtH37H/v51wl7lSOtVIQ6/aX6NiH6nZnex9fr4Qpi1X/N5JoWtB ChwIeKHxRVpy3fjWqMjPIO16V1OJpM7u8vfcwlPLBhib6bH+q9eM/tWtiZ3J2EUhWmyT IwrkYJKXM/SSqj8D0x5/MS6DiehApewlY7ksVTRVm8uLq/bnYkGXWXLAwbH8LeNEIjF/ QRK/CTQM0XNKEdT+1XRovExQGY9sgUn1/buPu26W2zmAqCyJB/66QN1dtmRKKdz//k7T uvRg== X-Gm-Message-State: AOAM532D7RO12i4IlMtUP3uKPxN8KD50OemqhxnzHtE6Zg38Y+da6Y93 iGzjO3zdBIUVjiTJeMxuWhGYhAFZbTk= X-Google-Smtp-Source: ABdhPJw4ku37MuenuJK1wlUwmGCI3oTCm+TZWQ3bCvaFtQCy0eNAKINVK3ThZQknTsMAR09XE9r7wg== X-Received: by 2002:a17:907:62a6:b0:6ef:8118:d3e2 with SMTP id nd38-20020a17090762a600b006ef8118d3e2mr8850358ejc.605.1650733599436; Sat, 23 Apr 2022 10:06:39 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b7-20020a170906708700b006da8440d642sm1855481ejk.113.2022.04.23.10.06.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 10:06:39 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 23 Apr 2022 16:25:55 +0200 Message-ID: <454555484d434cefead47968e938ea071fe6121a.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/shepherd.scm (): New record type. (shepherd-endpoint->sexp): New variable. * doc/guix.texi (Shepherd Services): Document it. --- doc/guix.texi | 29 +++++++++++++++++++ gnu/services/shepherd.scm | 60 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 5399584cb0..38aeda1d2d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -37675,6 +37675,35 @@ This, as you can see, is a fairly sophisticated way to say hello. info on actions. @end deftp +@deftp {Data Type} shepherd-endpoint +This is an endpoint that a systemd-style shepherd service listens on. + +@table @code +@item address +This is the socket address that shepherd binds and forwards to the service. + +@item name +‾\_(ツ)_/‾ + +@item style +‾\_(ツ)_/‾ + +@item backlog +‾\_(ツ)_/‾ + +@item socket-owner +This is the user ID owning the socket. + +@item socket-group +This is the group ID owning the socket. + +@item socket-directory-permissions +These are the UNIX permissions to set for the directory the socket +resides in. + +@end table +@end deftp + @defvr {Scheme Variable} shepherd-root-service-type The service type for the Shepherd ``root service''---i.e., PID@tie{}1. diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 4fd4b2a497..3ef0023d7f 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -66,6 +66,16 @@ (define-module (gnu services shepherd) shepherd-action-documentation shepherd-action-procedure + shepherd-endpoint + shepherd-endpoint-address + shepherd-endpoint-name + shepherd-endpoint-style + shepherd-endpoint-backlog + shepherd-endpoint-socket-owner + shepherd-endpoint-socket-group + shepherd-endpoint-socket-directory-permissions + shepherd-endpoint->sexp + %default-modules shepherd-service-file @@ -183,6 +193,56 @@ (define %default-modules ((guix build utils) #:hide (delete)) (guix build syscalls))) +(define-record-type* + shepherd-endpoint make-shepherd-endpoint + shepherd-endpoint? + (address shepherd-endpoint-address) ; sockaddr + (name shepherd-endpoint-name ; string | #f + (default #f)) + (style shepherd-endpoint-style ; int | #f + (default #f)) + (backlog shepherd-endpoint-backlog ; int | #f + (default #f)) + (socket-owner shepherd-endpoint-socket-owner ; uid | #f + (default #f)) + (socket-group shepherd-endpoint-socket-group ; gid | #f + (default #f)) + (socket-directory-permissions + shepherd-endpoint-socket-directory-permissions ; chmod pattern (int) | #f + (default #f))) + +(define (shepherd-endpoint->sexp endpoint) + (match endpoint + (($ address + name style backlog socket-owner socket-group + socket-directory-permissions) + `(endpoint + ,(match (sockaddr:fam address) + ((? (cute = <> AF_INET) _) + `(make-socket-addr AF_INET + ,(sockaddr:addr address) + ,(sockaddr:port address))) + ((? (cute = <> AF_INET6) _) + `(make-socket-addr AF_INET6 + ,(sockaddr:addr address) + ,(sockaddr:port address) + ,(sockaddr:flowinfo address) + ,(sockaddr:scopeid address))) + ((? (cute = <> AF_UNIX) _) + `(make-socket-addr AF_UNIX + ,(sockaddr:path address)))) + ,@(fold + (match-lambda* + (((key value) seed) + (if value (cons* key value seed) seed))) + '() + `((#:name ,name) + (#:style ,style) + (#:backlog ,backlog) + (#:socket-owner ,socket-owner) + (#:socket-group ,socket-group) + (#:socket-directory-permissions ,socket-directory-permissions))))))) + (define-record-type* shepherd-service make-shepherd-service shepherd-service? From patchwork Sat Apr 23 14:39:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 38772 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5F31E27BBEA; Sat, 23 Apr 2022 18:07:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E0A1127BBE9 for ; Sat, 23 Apr 2022 18:07:39 +0100 (BST) Received: from localhost ([::1]:42946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niJER-0005tX-31 for patchwork@mira.cbaines.net; Sat, 23 Apr 2022 13:07:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1niJDr-0005QM-J0 for guix-patches@gnu.org; Sat, 23 Apr 2022 13:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1niJDr-0008WN-9I for guix-patches@gnu.org; Sat, 23 Apr 2022 13:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1niJDr-00074l-4w for guix-patches@gnu.org; Sat, 23 Apr 2022 13:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54986] [PATCH v2 3/3 WIP] services: mpd: Support socket activation. References: <9d4cc9d3ebb05d2aabf8f06e1890efe9b0b9a849.camel@gmail.com> In-Reply-To: <9d4cc9d3ebb05d2aabf8f06e1890efe9b0b9a849.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Apr 2022 17:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54986 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54986@debbugs.gnu.org Cc: ludo@gnu.org Received: via spool by 54986-submit@debbugs.gnu.org id=B54986.165073360927159 (code B ref 54986); Sat, 23 Apr 2022 17:07:03 +0000 Received: (at 54986) by debbugs.gnu.org; 23 Apr 2022 17:06:49 +0000 Received: from localhost ([127.0.0.1]:57145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niJDd-00073u-Dq for submit@debbugs.gnu.org; Sat, 23 Apr 2022 13:06:49 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:35398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niJDZ-00073A-Mt for 54986@debbugs.gnu.org; Sat, 23 Apr 2022 13:06:46 -0400 Received: by mail-ej1-f68.google.com with SMTP id l7so21987973ejn.2 for <54986@debbugs.gnu.org>; Sat, 23 Apr 2022 10:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=GhG4FwS5ELWHR4F8p1PH7qpP3YNN3wC1YRNv76XE5aU=; b=MLdyAEhMSHHslR5QukLaOp3EA3vMnfOW9/Q+17V3knSwgS5HgZnnoHDwkFUY1FSR0P 5EYuiVF2NoqEj/WuQ3jyguVyzFeF6BB40X3DIvdroady3RflOcTy9AJP40un0SQgCcnx IPBDFZWEMisrpEksCqncq9TKt6NF6jE/HGDrq4aZf/4OntRjPyZQzTypB4Ew5aVAi61T Izy0TnutrXdTzN4pnpOBFsRzdW7fVKji8/Tz63duvmkCPqAqR+7RjW8W4mH4qDCbCx4V B+98zmzehp7qCL8aJXw+zOMeraD01h9mTrf1Yyiy9Vpw0rMvlaMwugq9sdZpYIDEedwg STEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:cc :content-transfer-encoding:message-id:mime-version; bh=GhG4FwS5ELWHR4F8p1PH7qpP3YNN3wC1YRNv76XE5aU=; b=D8ZkpPGUqUn6vySxJo3lsIoyk0qn9avUTfi46ZKvRpp7qys9QM5O2xCGG4YMnHjxZz Z9PzFO1EbVyi9jZf85twZxTE0SpVff7Kp/osswJcrDewJw/Jf1kyZ22/DuOvJrsdrNGO dJGQ06swgM9Lizdc5SgxyfQTQXpKo17mKL83E5GVSJdywCjXd4epVeqpOj7rL1C/Y4yT xJdMp0CppmgwEhk3UaGtvMaOnsOa5tFLkUo3Oim5NK+26UsLYZnJPerQ3q6F0FUfDDsT f4YvRUTk9Tzal7DZh1f00ZlnpjIlbUkT2w9LhI6xAIaK0cvMKjoBa/Q/kt+/hL54gTv0 c2KQ== X-Gm-Message-State: AOAM531X5d1vbH1EZjXu15ZPbi7NP4piNRGVhooI/LorTWDYvfGqeRnf bAkFot2F4TAQRjqTIpL9gQQPleUIL6A= X-Google-Smtp-Source: ABdhPJzi9eNyO/fId5sKJ/vujBN2zh7qJZSoiIylRvOvBdyVhNLk1ED9hNHrIbo/y2UnWzL6cNVpbw== X-Received: by 2002:a17:907:9805:b0:6db:4c33:7883 with SMTP id ji5-20020a170907980500b006db4c337883mr9273235ejc.555.1650733600150; Sat, 23 Apr 2022 10:06:40 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b7-20020a170906708700b006da8440d642sm1855481ejk.113.2022.04.23.10.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 10:06:39 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 23 Apr 2022 16:39:59 +0200 Message-ID: <155723efbcf08c6e0bb6552b8f6341d4a1f20ecb.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/audio.scm ()[shepherd-endpoints]: New field. (mpd-shepherd-service): Use it. * doc/guix.texi (Music Player Daemon): Document it. --- doc/guix.texi | 7 +++++++ gnu/services/audio.scm | 45 ++++++++++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 38aeda1d2d..6bfa854b1d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -30883,6 +30883,13 @@ The port to run mpd on. The address that mpd will bind to. To use a Unix domain socket, an absolute path can be specified here. +@item @code{shepherd-endpoints} (default: @code{'()}) +The endpoints shepherd shall bind and spawn MPD from. If this field is +not empty (checked via @code{null?}), a systemd-style service is used +rather than a forkexec-service. This delays the start of MPD until the +first client connects. As a side effect @code{port} and @code{address} +may be ignored. + @item @code{outputs} (default: @code{"(list (mpd-output))"}) The audio outputs that MPD can use. By default this is a single output using pulseaudio. diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index c60053f33c..b184ac596a 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -78,6 +78,8 @@ (define-record-type* (default "6600")) (address mpd-configuration-address (default "any")) + (shepherd-endpoints mpd-configuration-shepherd-endpoints + (default '())) ; list of (outputs mpd-configuration-outputs (default (list (mpd-output))))) @@ -140,19 +142,36 @@ (define (mpd-shepherd-service config) (documentation "Run the MPD (Music Player Daemon)") (requirement '(user-processes)) (provision '(mpd)) - (start #~(make-forkexec-constructor - (list #$(file-append mpd "/bin/mpd") - "--no-daemon" - #$(mpd-config->file config)) - #:environment-variables - ;; Required to detect PulseAudio when run under a user account. - (list (string-append - "XDG_RUNTIME_DIR=/run/user/" - (number->string - (passwd:uid - (getpwnam #$(mpd-configuration-user config)))))) - #:log-file #$(mpd-file-name config "log"))) - (stop #~(make-kill-destructor)))) + (start (if (null? (mpd-configuration-shepherd-endpoints config)) + #~(make-forkexec-constructor + (list #$(file-append mpd "/bin/mpd") + "--no-daemon" + #$(mpd-config->file config)) + #:environment-variables + ;; Required to detect PulseAudio when run under a user account. + (list (string-append + "XDG_RUNTIME_DIR=/run/user/" + (number->string + (passwd:uid + (getpwnam #$(mpd-configuration-user config)))))) + #:log-file #$(mpd-file-name config "log")) + #~(make-systemd-constructor + (list #$(file-append mpd "/bin/mpd") + "--systemd" + #$(mpd-config->file config)) + (list #$@(map shepherd-endpoint->sexp + (mpd-configuration-shepherd-endpoints config))) + #:environment-variables + ;; Required to detect PulseAudio when run under a user account. + (list (string-append + "XDG_RUNTIME_DIR=/run/user/" + (number->string + (passwd:uid + (getpwnam #$(mpd-configuration-user config)))))) + #:log-file #$(mpd-file-name config "log")))) + (stop (if (null? (mpd-configuration-shepherd-endpoints config)) + #~(make-kill-destructor) + #~(make-systemd-destructor))))) (define (mpd-service-activation config) (with-imported-modules '((guix build utils))