From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MPxjCxXm+WHTBAEAgWs5BA (envelope-from ) for ; Wed, 02 Feb 2022 03:01:57 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id yDUmBBXm+WH7AgAAG6o9tA (envelope-from ) for ; Wed, 02 Feb 2022 03:01:57 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9C5311FD4A for ; Wed, 2 Feb 2022 03:01:56 +0100 (CET) Received: from localhost ([::1]:47738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF4y3-0008Rz-7G for larch@yhetil.org; Tue, 01 Feb 2022 21:01:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEzeA-0004Ol-Q8 for guix-patches@gnu.org; Tue, 01 Feb 2022 15:21:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nEzeA-0001Bt-Go for guix-patches@gnu.org; Tue, 01 Feb 2022 15:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nEzeA-0001sb-7K for guix-patches@gnu.org; Tue, 01 Feb 2022 15:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53676] [PATCH 3/5] gnu: pulseaudio: Graft to adjust configuration. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Feb 2022 20:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53676 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 53676@debbugs.gnu.org Received: via spool by 53676-submit@debbugs.gnu.org id=B53676.16437468367169 (code B ref 53676); Tue, 01 Feb 2022 20:21:02 +0000 Received: (at 53676) by debbugs.gnu.org; 1 Feb 2022 20:20:36 +0000 Received: from localhost ([127.0.0.1]:44251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEzdj-0001rZ-Sr for submit@debbugs.gnu.org; Tue, 01 Feb 2022 15:20:36 -0500 Received: from mail-qv1-f47.google.com ([209.85.219.47]:33319) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEzdh-0001rL-Pv for 53676@debbugs.gnu.org; Tue, 01 Feb 2022 15:20:34 -0500 Received: by mail-qv1-f47.google.com with SMTP id b4so12236506qvf.0 for <53676@debbugs.gnu.org>; Tue, 01 Feb 2022 12:20:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=yxqS1fFiWLS7ZF44s34Y7X7xDEXGxG1S8oBf6g0PX7w=; b=A5zk/POvr1TVAIPdPWSbDqSEEKl1wgniG7DKfuZXFutD0IWuO7c7Wcy3kfHbohh6Qn 9VvJANkLbTH4HQrNM7gkMAGv4ZZNZnSEZuVhZAmuUoRAOe6COlDAJ4U/4XxuXy0uKBem TiMb0/7PH0VQOE654NKJNr42H2pQdTooudL0euAPYewNUKKE3uoFtzE2rGsJ8RfosxbQ VSdm0JNoUv9hmi1MeAjH/BM1de6A2g7olpXN2rxxLp0TSG+Fo28emGGSoAnkMb33RJ7i ehu6Tq+PtoX/bpWI0r9eNqFUPyVffOQ49OYHhInX5u5d8QQTgZkRAMGTWlTaj4D8tAHz +0IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=yxqS1fFiWLS7ZF44s34Y7X7xDEXGxG1S8oBf6g0PX7w=; b=ah19INcgmD0dF2oOgLV1PA3kbQFL0wiaN4iidN1aSkV1eVH817zD8yYEOc5E2KZqze b0oQZQbOIv1iiv+eFtXbmFDbWdcZAogZHHTbiFqFCIG5UaoxYlK7YcOpFbpq7zX02ac6 dwteFgKybuDG0u8RmjW8vwt2lRdc5haqVcvUfGXHzRjJ3IMve//bZYb1R2EpCdyijz+2 NUnUQmuyFjBaT2K4bxpvKEkV/wN0pwNHYc7WznqtPPDYINWoIr05EAn2tMBsrDzY4AXx Kzut706akBPP9FblLA+e4INNEfoHxSSoITyyhXgfJ55zlac456I7HGdaSzEXfzFzkddL XNhg== X-Gm-Message-State: AOAM531iveQ2EXu430T3P1vH6hFwn1ELACV4QHZfHApTt7N96KrRfAUP vXtnZzG3pSQjPxxEb7kJqVVYDB8SVuc= X-Google-Smtp-Source: ABdhPJx1Fv/BHuypQIsM1lZKyicwuiL5drAtrZ3nHB2WNCA7hlSlMpfIJfIkaVhFBgWsY4pXB8vD1g== X-Received: by 2002:a05:6214:21e8:: with SMTP id p8mr24268871qvj.116.1643746828216; Tue, 01 Feb 2022 12:20:28 -0800 (PST) Received: from hurd (dsl-149-193.b2b2c.ca. [66.158.149.193]) by smtp.gmail.com with ESMTPSA id g24sm7756343qkk.76.2022.02.01.12.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 12:20:27 -0800 (PST) From: Maxim Cournoyer References: <20220201041933.16603-1-maxim.cournoyer@gmail.com> <20220201041933.16603-3-maxim.cournoyer@gmail.com> <693cc82d449395853247c7fbf1b44d0a3c979c87.camel@gmail.com> Date: Tue, 01 Feb 2022 15:20:26 -0500 In-Reply-To: <693cc82d449395853247c7fbf1b44d0a3c979c87.camel@gmail.com> (Liliana Marie Prikler's message of "Tue, 01 Feb 2022 20:45:48 +0100") Message-ID: <875ypy1gqd.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1643767316; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=yxqS1fFiWLS7ZF44s34Y7X7xDEXGxG1S8oBf6g0PX7w=; b=rKo4ZALc7v6rmM4zOwHewCvtt4ThaNqqIGRq1SpSEjgUTCdJDDECjiFO43nm5VDfkjvCEN toLS8S4eiD26vGEd3vXCKfnu6h08f9DPd+QO6Z2sYXuSz/eXrhZ1GQES087bWz5eeo2DDK fbGJ+LXiRq0RxNfxyKaZIHnl/I7RhLJTlhOHSNA0ttUaUbiBobSfQhHsrLWj/Od+dUcAKL AmlnO/dbAKUXBBYDO5l3pZpwiuyG+7WeXfdAw1W8w/HjsmIxnMIb4a5NqqlvvMJp8ZkIuL 60SR4uEjTilhJ9mySZtJrROjNxQ7Nqcf/VuRw7YSUnHO4WvTtI+vmo53cLCVHw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643767316; a=rsa-sha256; cv=none; b=Ft0DY6ZTdjSozQ1fnBCIJGIM4csICZ9j/zPPqwx9CkLnxcjwUoknQCUw0+9MiHENtHPBcK HmeDGF9UmbdSKeL8ojdKmdu0tVAr3D5K6uDSPuNxesO0MgtE1jsajTdCoLYVU+RyvnVQhR 6FkIhvu8xkQuw7sNmKRS3XtEmwGexDz/My2F2cxEfiM4xBOWCq+KoQBv+Hw7yIVHlCnvbn OujEtYb5BDRmkHefoeeRVwrb6A8hJaekaEJmOHacmFOPrbH4qICfxiqKQb1fPZWncs2lFp A8zOGs2JZy8fBow3PRh2zzohegka4TIbH1Nv3dMP6U3xS4Sg2Iy1rX4301Fspw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="A5zk/POv"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="A5zk/POv"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 9C5311FD4A X-Spam-Score: -3.03 X-Migadu-Scanner: scn0.migadu.com X-TUID: 8OfbKO7Ni8/9 Hi Liliana, Liliana Marie Prikler writes: > Am Montag, dem 31.01.2022 um 23:19 -0500 schrieb Maxim Cournoyer: >> * gnu/packages/pulseaudio.scm (pulseaudio/fixed): New variable. >> (pulseaudio)[replacement]: Graft package with it. >> --- >> =C2=A0gnu/packages/pulseaudio.scm | 18 ++++++++++++++++++ >> =C2=A01 file changed, 18 insertions(+) >>=20 >> diff --git a/gnu/packages/pulseaudio.scm >> b/gnu/packages/pulseaudio.scm >> index fe028b5202..f529717ee1 100644 >> --- a/gnu/packages/pulseaudio.scm >> +++ b/gnu/packages/pulseaudio.scm >> @@ -178,6 +178,7 @@ (define-public libsamplerate >> =C2=A0(define-public pulseaudio >> =C2=A0=C2=A0 (package >> =C2=A0=C2=A0=C2=A0=C2=A0 (name "pulseaudio") >> +=C2=A0=C2=A0=C2=A0 (replacement pulseaudio/fixed) >> =C2=A0=C2=A0=C2=A0=C2=A0 (version "15.0") >> =C2=A0=C2=A0=C2=A0=C2=A0 (source (origin >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 (method url-fetch) >> @@ -269,6 +270,23 @@ (define-public pulseaudio >> =C2=A0=C2=A0=C2=A0=C2=A0 ;; 'LICENSE' for details. >> =C2=A0=C2=A0=C2=A0=C2=A0 (license l:gpl2+))) >> =C2=A0 >> +(define pulseaudio/fixed >> +=C2=A0 (package >> +=C2=A0=C2=A0=C2=A0 (inherit pulseaudio) >> +=C2=A0=C2=A0=C2=A0 (arguments >> +=C2=A0=C2=A0=C2=A0=C2=A0 (substitute-keyword-arguments (package-argumen= ts pulseaudio) >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ((#:phases phases) >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 `(modify-phases ,phases >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (add-after= 'unpack 'customize-default-script >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 (lambda _ >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (call-with-port >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (open-file "src/daemon/default.pa.in" "a") >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (lambda (port) >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (format port "~%\ >> +### Include extra script files configured via the pulseaudio- >> service-type. >> +.nofail >> +.include /etc/pulse/default.pa.d~%"))))))))))) >> + > Note that there should be a .fail afterwards. =C2=A0 Hmm. I simply duplicated the existing two lines used by PulseAudio itself. I believe they do not care because it appears completely at the end of the file. > As Leo pointed out, we shouldn't do too many "feature grafts", so > instead it might be worth moving this part to pulseaudio-service-type > in some way, no? I'd prefer to keep it like this, for simplicity; we need to rebuild the world soon anyway to fix a Rust CVE, so we can batch things easily. Maxim