From patchwork Thu Oct 5 17:33:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 54721 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 400D527BBEA; Tue, 10 Oct 2023 20:34:11 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 A185927BBE2 for ; Tue, 10 Oct 2023 20:34:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqIUC-0000Df-Ny; Tue, 10 Oct 2023 15:33:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqIU9-0000Cg-6F for guix-patches@gnu.org; Tue, 10 Oct 2023 15:33:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqIU8-0008Jg-M4 for guix-patches@gnu.org; Tue, 10 Oct 2023 15:33:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qqIUU-0008N1-0B for guix-patches@gnu.org; Tue, 10 Oct 2023 15:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66099] [PATCH gnome-team v10 2/6] services: udev: Rewrite udev-rule to use file->udev-rule. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Oct 2023 19:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66099 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer , Liliana Marie Prikler , 66099@debbugs.gnu.org Cc: rg@raghavgururajan.name Received: via spool by 66099-submit@debbugs.gnu.org id=B66099.169696640232060 (code B ref 66099); Tue, 10 Oct 2023 19:34:01 +0000 Received: (at 66099) by debbugs.gnu.org; 10 Oct 2023 19:33:22 +0000 Received: from localhost ([127.0.0.1]:36919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqITp-0008L1-Ng for submit@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:21 -0400 Received: from planete-kraus.eu ([89.234.140.182]:33880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqITl-0008KX-Gv for 66099@debbugs.gnu.org; Tue, 10 Oct 2023 15:33:18 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 1d48f7c3; Tue, 10 Oct 2023 19:32:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=0AUk4LfgvemuRiq7Ywyf4FhmA3g=; b=P 74CcKjXiG1zMT7TkHSpeqn5tkdpDBuEl3TtOlQMd/wEl1PLBMUgDXf0CA5tyk9AC 487xa9dB9NOOiO20l3UuG3pfOvUtreb0CHr43MM4htltd8Did+tRmqCYJkLXPJhg sMdMDMMvBWcIDc272D6hXpJIWl6huqgBMTaC2fo4/gwYi8Zr7leWZsLJZPMnIG+M oJL0/BJSkLQAEXO2DfSasAbi9TzgGR7TMxGpQl01zOBTn5JP3ENHTHJnpVMzfQI5 MK/Mx8XjyocCfBMAOX+kIphp5i4CL8cgLt7UIxxrxRC9iKdkwrd8DAO5scVdM2Da uDH/u3k0vA0a13qSD1emg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ad5eed02 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 10 Oct 2023 19:32:54 +0000 (UTC) Message-ID: <70ae450282e2411c5506447c79adf6a62345344c.1696966139.git.vivien@planete-kraus.eu> In-Reply-To: <4744acd296e1c2f5d3f9f14c7cfba3e3696dcac7.1696966139.git.vivien@planete-kraus.eu> References: <87mswte1rx.fsf@gmail.com> <4744acd296e1c2f5d3f9f14c7cfba3e3696dcac7.1696966139.git.vivien@planete-kraus.eu> Date: Thu, 5 Oct 2023 19:33:24 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/base.scm (udev-rule): Use file->udev-rule. --- gnu/services/base.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 98d59fd36d..8b54f30ef6 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2262,19 +2262,7 @@ (define (udev-rules-union packages) (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (computed-file file-name - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - - (define rules.d - (string-append #$output "/lib/udev/rules.d")) - - (mkdir-p rules.d) - (call-with-output-file - (string-append rules.d "/" #$file-name) - (lambda (port) - (display #$contents port))))))) + (file->udev-rule file-name (plain-file file-name contents))) (define (file->udev-rule file-name file) "Return a directory with a udev rule file FILE-NAME which is a copy of FILE."