From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2KEPOi0AGGLwZwAAgWs5BA (envelope-from ) for ; Thu, 24 Feb 2022 23:01:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id YITZMi0AGGLI2QAAG6o9tA (envelope-from ) for ; Thu, 24 Feb 2022 23:01:17 +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 593A235B07 for ; Thu, 24 Feb 2022 23:01:14 +0100 (CET) Received: from localhost ([::1]:52118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNMAi-0006rN-Mn for larch@yhetil.org; Thu, 24 Feb 2022 17:01:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNMAY-0006qr-Gz for guix-patches@gnu.org; Thu, 24 Feb 2022 17:01:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNMAY-0005b0-6w for guix-patches@gnu.org; Thu, 24 Feb 2022 17:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nNMAY-0007DD-28 for guix-patches@gnu.org; Thu, 24 Feb 2022 17:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53676] [PATCH v2 2/4] gnu: pulseaudio: Graft to adjust configuration. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Feb 2022 22:01: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.164574004427693 (code B ref 53676); Thu, 24 Feb 2022 22:01:02 +0000 Received: (at 53676) by debbugs.gnu.org; 24 Feb 2022 22:00:44 +0000 Received: from localhost ([127.0.0.1]:50635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNMAF-0007Cb-Qr for submit@debbugs.gnu.org; Thu, 24 Feb 2022 17:00:44 -0500 Received: from mail-qk1-f171.google.com ([209.85.222.171]:43626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNMAE-0007CO-Cb for 53676@debbugs.gnu.org; Thu, 24 Feb 2022 17:00:42 -0500 Received: by mail-qk1-f171.google.com with SMTP id z66so3019778qke.10 for <53676@debbugs.gnu.org>; Thu, 24 Feb 2022 14:00:42 -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=KzPK3cySntE1UoIo79Trm2UhCEMJXFCOnaSQlAH7eIg=; b=S8j7/Rc2gFUhyPeRkTj7Cbuzk9Bfn8RTccKQ7j8vjoPwhexbJtm26Bpd52e7Wo8tas z2esuVWFdGeAiJCWZFx2eB2FLc/0Ssvb9V5Ry3T+Y5yIat7NcTbPB7aSsGgm07LP+oyJ vlm/Vwukq/Gx9IXta54Mc0ofFw2GMJdlNxkWRRDth5lofGrcYvOnwprjAV44pnWtXUbK Rr6F43ltjRFyhT6RcLNEcoWcoIR289RqclF64rv9+hylkeIPErImdDPWFVem6HebJnej n0CktAKt17+L+tNk99h/VWF4vU+hli8i9ymvLs6H3M9H9VZbQRddX9xcgTvsY/EcXeKd Djig== 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=KzPK3cySntE1UoIo79Trm2UhCEMJXFCOnaSQlAH7eIg=; b=SHku3OSPrj6YXKrdj/JLLjly+tsugLfiPk0NfWAICqwzryVv/q31fKcyKJuRkxXETM U4MGCKA9ZSpeySf6CmfJ5n1BOEETWwyFRxk9y4SIOF9jjNN1XGtyMzDdnDeHBqhH4G/W miYKpyXTv3JPhA599lrOqBEZUwPlmdiyG8LxzO0C4ZSNAfbo+Uql7lW67ar5F7MKchF+ ejT1BGCP22prDGf3r6abkADJ140tp4p7xWpY2TmefbikAyKVgG0+bjflu4LYrqKliItE UKXxwrZNPb5JA7hcv1kj8Mg96DUXnx8jZdrRE7HuGsvQ0gEURD1HaQg9GdXovGHOKLGv zd8A== X-Gm-Message-State: AOAM531ZyTH8Z+tNiyDJIQkAEUcjrFMc0uwrUizU+rgtjFdHYks6/FxX aaEm/CtS4JMcNfraM8L/aTjgo+/uVULKxg== X-Google-Smtp-Source: ABdhPJzgaYygLjfwxOWQMkSv3PDQJdNLe5OAVXByhJbfexDgVU0dAiadf+YqsA6snLrbp88DF3rvGg== X-Received: by 2002:a37:80b:0:b0:507:58e:5dd4 with SMTP id 11-20020a37080b000000b00507058e5dd4mr3147076qki.130.1645740036372; Thu, 24 Feb 2022 14:00:36 -0800 (PST) Received: from hurd (dsl-156-1.b2b2c.ca. [66.158.156.1]) by smtp.gmail.com with ESMTPSA id o1-20020a37be01000000b00648eadafd9bsm414760qkf.24.2022.02.24.14.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 14:00:35 -0800 (PST) From: Maxim Cournoyer References: <20220224163828.11330-1-maxim.cournoyer@gmail.com> <20220224163828.11330-2-maxim.cournoyer@gmail.com> <387664c06141015c8fbf8db79a29e7ab09367dc2.camel@gmail.com> Date: Thu, 24 Feb 2022 17:00:34 -0500 In-Reply-To: <387664c06141015c8fbf8db79a29e7ab09367dc2.camel@gmail.com> (Liliana Marie Prikler's message of "Thu, 24 Feb 2022 20:47:24 +0100") Message-ID: <877d9j2ad9.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=1645740074; 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=KzPK3cySntE1UoIo79Trm2UhCEMJXFCOnaSQlAH7eIg=; b=qnH+TvaEKzsg6oH/P6TgA2IjoIdo8JnkGhpsJpIT7YwoEfskXCG4dNNojMPPd2m50p7UOD H6Yc7anUFiC3rkOvVoQqnnlZG4aHXDy+h9O5O8/lmZCYfihWm/hxF5sxV2GBPQvimd2S18 MP4MEwOzfuoQXBIESa9CjStQLV9/NEeSc4yUNzYAgXt2c864oZZPC22MXIxCQha65Mw1pD m+uUAp3z7kf4ZqNT6v0mA360H5QzRy9CrAb8A90zP9fdxLZ8xyCvRfAUbPuRHyC813z9lw u/uzMzSVDKcCpm6PBk06Akb+cXX4UxFEoggzydfjmh1c0qusrHe7B6mQ/pHEGQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645740074; a=rsa-sha256; cv=none; b=L+TsTg6sTentzoa8eoeaQRIWW+1X+a0AZ029NKiS9QkyN4aJy3NOG0IWYsV65Gt00HUCzz WSLptfa2fsP888xCeUdplP3V8BTE8KLhz5A+3jY3XU59/99BxfUP74ohonKdLkXc97UWb0 3h8+fJC1tu+zFlhNSS9S0aVqqpBLBKs/I0X4wvhCEnECqSmMIv8toMvsKlLVdvz/s1EHDp AnhN8huTYWVl7UDKzVYGi5xUcPK0pL3oFRTRrBOzJHeax/iJsAWlLsbMerZgFwF32mKh7C FJjD9KjtUc9Q2kI7wQseyIb85DpVkS9Me681sv/7v8dZQ/4Mtv15OSWH0sZvTA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="S8j7/Rc2"; 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="S8j7/Rc2"; 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: 593A235B07 X-Spam-Score: -2.03 X-Migadu-Scanner: scn1.migadu.com X-TUID: LZSVxLcFGlBt Hi Liliana, Liliana Marie Prikler writes: > Am Donnerstag, dem 24.02.2022 um 11:38 -0500 schrieb Maxim Cournoyer: >> * gnu/packages/pulseaudio.scm (pulseaudio/fixed): New variable. >> (pulseaudio)[replacement]: Graft package with it. [...] >> +(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 (substitute* "src/daemon/default.pa.in" >> +=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 (("^\\.include.*default.pa.d.*" anchor) >> +=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 (string-append >> +=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=C2=A0 ;; Honor PulseAudio script extensio= ns found under >> +=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=C2=A0 ;; /etc/pulse/default.pa.d. >> +=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=C2=A0 anchor ".include >> /etc/pulse/default.pa.d\n"))))))))))) >> + > I still think it'd be wiser to do this inside the code that generates > the configuration when we do fill /etc/pulse/default.pa.d given that > there's stuff to source. At the very least, we'd avoid a graft for the > moment, but we'd also avoid some "lol, just source anything" scenarios. Thank you for your continued feedback. The reason I prefer this simple substitution to a conditional one is two-fold: 1. It avoids two actors potentially touching the default 'script-file' (the pulseaudio-service-type code as well as the user), which could be unwieldy (do we plug the default.pa.d after their changes to ensure it is there, or before, which means it'd potentially be erased?). Having it part of the shipped default.pa file makes this simpler to reason with. 2. It allows foreign distribution users to keep their custom user script working even when they use our pulseaudio package (it makes our pulseaudio package behave as intended by upstream). I wouldn't mind using a feature branch to get the < 2k dependent packages rebuilt as suggested by Leo, if you think that's preferable. Thanks, Maxim