From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iAPXKdu/+WErLQAAgWs5BA (envelope-from ) for ; Wed, 02 Feb 2022 00:18:51 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id KKwOJ9u/+WF6qQAA9RJhRA (envelope-from ) for ; Wed, 02 Feb 2022 00:18:51 +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 3CE93138B1 for ; Wed, 2 Feb 2022 00:18:48 +0100 (CET) Received: from localhost ([::1]:59406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF2QB-00047u-CB for larch@yhetil.org; Tue, 01 Feb 2022 18:18:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nF0qk-0003F8-CZ for guix-patches@gnu.org; Tue, 01 Feb 2022 16:38:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nF0qg-0004jW-EB for guix-patches@gnu.org; Tue, 01 Feb 2022 16:38:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nF0qg-0003t9-8d for guix-patches@gnu.org; Tue, 01 Feb 2022 16:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53676] [PATCH 3/5] gnu: pulseaudio: Graft to adjust configuration. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Feb 2022 21:38: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: Maxim Cournoyer Cc: 53676@debbugs.gnu.org Received: via spool by 53676-submit@debbugs.gnu.org id=B53676.164375145014906 (code B ref 53676); Tue, 01 Feb 2022 21:38:02 +0000 Received: (at 53676) by debbugs.gnu.org; 1 Feb 2022 21:37:30 +0000 Received: from localhost ([127.0.0.1]:44332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nF0q9-0003sM-S2 for submit@debbugs.gnu.org; Tue, 01 Feb 2022 16:37:30 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:43934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nF0q8-0003s6-0Z for 53676@debbugs.gnu.org; Tue, 01 Feb 2022 16:37:28 -0500 Received: by mail-ej1-f68.google.com with SMTP id d10so58383491eje.10 for <53676@debbugs.gnu.org>; Tue, 01 Feb 2022 13:37:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=9+eQp0fKQ+n4QJqqmLINcnWxuswYuvgpK58bBpKTx5w=; b=US5peQ5KGRkwq9HZ7ZEGSNSyfrzxnTUtHGRfuqUeld6hCRPz228F8OFs+xukNkjEpK 8Nu9aK2V9r66Ju/VjXYQRMUsZnX4rMyupfjcJEMu8G4bqPBLkhVre6bCaskmaNusa81o 6fLqmeUIILNgRFcV5iEKTPwcXCDRs4zaHh2YYBBwGprMlX6ZR5TC70Nki727XkqIAg/m Ce5CzEuhhEd7IrRpmwKsE2jyV383cnoN9NBHe/6Oc8/k2GTywj0/YhrvItvnnA5JLGrL nsFiMh9iDjcR1wcLxHOG3RR3Cw4DzW+WZrUwiaCu/GNnZLz6yWbNNCWr2SbYmgpVLNFv TjbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=9+eQp0fKQ+n4QJqqmLINcnWxuswYuvgpK58bBpKTx5w=; b=LvESW7Um2RvHcquNTMiQTWV+3uXPJBoGWcCbJS7dTrRztfMN3e5I4Ut5aOq6LA7UsL 2gV7uAskWUTGF2Lf8R+idmp4NMInZDso8S7lVsHpebcBDI0xKB3Xniz9ANsDdrGgYFmY EI1FmD4ofBlCM+CFBOlMk8igAwi/PbvRY0eGRedSSoV5+mEk4qAO2K0HEbBxgVTU6JQV hFpGNkEMXYcsTxhcBmfu8sBHvi3DabUkLpwrNH5b8F9CIzzeTbiylP4rEkgK9saWhclM VGwoP87HRwhHsN2MeP/r4C4HJsSrTFnrcINZeAiDfM4fjXV2ARTtTFkPp81ULivxOmuP W9nQ== X-Gm-Message-State: AOAM530WwooO8JNHW0ijsmMhEcW/fWBBbLIrK5cSegE6z5QNiX0tktgF Z1nrujd5Rblz5OPzb+7KYkI= X-Google-Smtp-Source: ABdhPJzTmLyI7+OnnXlwE5mZFN0/jACZfp8+a+gj5Qw7MvTd/ebD9lNDYv8xrI3MCxd9SC9eUIN8AQ== X-Received: by 2002:a17:906:3cd:: with SMTP id c13mr22738584eja.720.1643751442175; Tue, 01 Feb 2022 13:37:22 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id by22sm14979509ejb.5.2022.02.01.13.37.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 13:37:21 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Tue, 01 Feb 2022 22:37:20 +0100 In-Reply-To: <875ypy1gqd.fsf@gmail.com> References: <20220201041933.16603-1-maxim.cournoyer@gmail.com> <20220201041933.16603-3-maxim.cournoyer@gmail.com> <693cc82d449395853247c7fbf1b44d0a3c979c87.camel@gmail.com> <875ypy1gqd.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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=1643757528; 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=9+eQp0fKQ+n4QJqqmLINcnWxuswYuvgpK58bBpKTx5w=; b=oT/0zgeuWbHYxUTBMkm0RNXBjHn0hXleiIyRkQTWHM3OSdunV/V8SHqMCT1MOz848iYeco nZBSg7+bLJyNsFasKnjYNcT9peF4IRkEDl6ia2cCLTtSkZFXe5sUqpnsJlK6SB7N2wTW1I 6Mv6g+oxiM8WPM2IrgvvFK7gZNwTOn/eXrTvk9jIV0elVt3p6IdsabGQP8+SZsoLQ0sAZL aEbNiBP5R2DELT0rJjGQsUGlw9m2ErOzIgugXhUwbsFE1qJ2wQW8gO/0KM5Yc+ZsnQSEHP iIk9du32s9A6WBkFruQFA+eta0EpeaTHfUe7o8AbDt78+QFfRMZs4CgEDJrxww== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643757528; a=rsa-sha256; cv=none; b=syzrkexVdvyFe/DxKQL6F+THG49F0o2+HyhJH3jQOWJupArTdocnrfY4aMUYyfBM1xnYSu QgUjlszaSaklZZQqObvbAPF0/jr9nbOvgvraUBhku5/AfRnFEoBF5CuENrx08V0ga6W381 arilEYnWqdA/KK3xQP54p9iVcTLzoFzYsePp0Yw8dYaw5xps85usH1wuCnMmnRshqATX3Q C2Hc8m44EpqW1tOTjCU3nWXp88RkS6ujG39pVUX9Dd4VeX2nUXqtCP633zN0xPIzZlTpAb sjJe4TDq7EHJAcuMG4SQZ2E35CYVpfZ/AyPesjvw/ePkZlW3hcie4eZmU6Nafw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=US5peQ5K; 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: -2.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=US5peQ5K; 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: 3CE93138B1 X-Spam-Score: -2.03 X-Migadu-Scanner: scn1.migadu.com X-TUID: +O/cXFnffUCG Am Dienstag, dem 01.02.2022 um 15:20 -0500 schrieb Maxim Cournoyer: > 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. > > > --- > > >  gnu/packages/pulseaudio.scm | 18 ++++++++++++++++++ > > >  1 file changed, 18 insertions(+) > > > > > > 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 > > >  (define-public pulseaudio > > >    (package > > >      (name "pulseaudio") > > > +    (replacement pulseaudio/fixed) > > >      (version "15.0") > > >      (source (origin > > >               (method url-fetch) > > > @@ -269,6 +270,23 @@ (define-public pulseaudio > > >      ;; 'LICENSE' for details. > > >      (license l:gpl2+))) > > >   > > > +(define pulseaudio/fixed > > > +  (package > > > +    (inherit pulseaudio) > > > +    (arguments > > > +     (substitute-keyword-arguments (package-arguments > > > pulseaudio) > > > +       ((#:phases phases) > > > +        `(modify-phases ,phases > > > +           (add-after 'unpack 'customize-default-script > > > +             (lambda _ > > > +               (call-with-port > > > +                (open-file "src/daemon/default.pa.in" "a") > > > +                (lambda (port) > > > +                  (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.   > > 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. I think we would need to care though, because one could write a gexp that appends to default.pa, but then has unclear semantics. > > 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. Can you define "simplicity" here? In my opinion, services/stuff.scm or /etc/config.scm provide an easier point of change/extension than packages do -- particularly also because pulseaudio-service-type (even with this patch set) does not allow changing the pulseaudio package. For the record, if you're wondering why pulseaudio-service-type doesn't have a configuration knob for adding the pulseaudio package: pulseaudio is currently managed per user session through dbus, not shepherd. It'd be nice to have systemd-levels of control over user services, but we're not there yet. Cheers