From patchwork Wed Oct 4 21:05:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 54485 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 0683427BBEA; Wed, 4 Oct 2023 22:47:00 +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 3FB2627BBE9 for ; Wed, 4 Oct 2023 22:46:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qo9hi-0005S9-15; Wed, 04 Oct 2023 17:46:50 -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 1qo9hd-0005Q7-Ae for guix-patches@gnu.org; Wed, 04 Oct 2023 17:46:45 -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 1qo9hc-0000CB-TM for guix-patches@gnu.org; Wed, 04 Oct 2023 17:46:44 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qo9ht-0005Bt-Uf for guix-patches@gnu.org; Wed, 04 Oct 2023 17:47:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66099] [PATCH gnome-team v6 2/5] services: udev: unify udev-rule and file->udev-rule. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Oct 2023 21:47: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: Liliana Marie Prikler , maxim.cournoyer@gmail.com, 66099@debbugs.gnu.org Cc: rg@raghavgururajan.name Received: via spool by 66099-submit@debbugs.gnu.org id=B66099.169645597919865 (code B ref 66099); Wed, 04 Oct 2023 21:47:01 +0000 Received: (at 66099) by debbugs.gnu.org; 4 Oct 2023 21:46:19 +0000 Received: from localhost ([127.0.0.1]:45494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9hC-0005AL-MP for submit@debbugs.gnu.org; Wed, 04 Oct 2023 17:46:18 -0400 Received: from planete-kraus.eu ([89.234.140.182]:51252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qo9hA-0005AC-Ta for 66099@debbugs.gnu.org; Wed, 04 Oct 2023 17:46:17 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 081b11e5; Wed, 4 Oct 2023 21:45:58 +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=z/GLnF0Jh9PFfGO+K1XBvxIS2mQ=; b=s 50F1ZcKbSft92UFpyoeUCxHU/k3ARSksCWDil0FJCeZyIWUOutM27UC3jSCukeer 5FrtHuQis/OQ4G972aGMfRtrIgucDL2L3xaBFVgyOMNSHJEGfLzsRJ5LPEQKOJAR q/RspntCDImU4Dax5DBeTY+o4c1vSDDwPi+c60KsOPkN+yen4kSQWje9hq+Ilnx/ W9AYzy8oQgh4CmsOxOPDxiTQx5NM+R8OjA/bkz0is2sAEgQSqaYTeCZeUTrTBhjl dDSymjoJ3d6++PbsttVABL1o0P2hLUAEqiRBVPiyd02NaU5pjRCu4qMi6QtV1ogF M+HH3hPiQtdhLhWG+hbWA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id b2cfacbd (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 4 Oct 2023 21:45:57 +0000 (UTC) Message-ID: <7f63dfc3b0cc8321212f024bddc1c4625fadfe45.1696455423.git.vivien@planete-kraus.eu> In-Reply-To: References: <42e4b490bce80a94f1afb7f5843d77823058150a.camel@gmail.com> Date: Wed, 4 Oct 2023 23:05:19 +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): Implement in terms of file->udev-rule. Use texinfo in docstring. --- gnu/services/base.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index b3f2d2e8b8..190803b780 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2211,20 +2211,9 @@ (define (udev-rules-union packages) (computed-file "udev-rules" build)) (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))))))) + "Return a directory with a udev rule file @var{file-name} containing +@var{contents}." + (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."