From patchwork Wed Jun 1 15:42:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 2769 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 9F6A327BBEA; Wed, 1 Jun 2022 16:44:13 +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=unavailable 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 464CB27BBE9 for ; Wed, 1 Jun 2022 16:44:13 +0100 (BST) Received: from localhost ([::1]:57780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwQW4-0004Dg-EX for patchwork@mira.cbaines.net; Wed, 01 Jun 2022 11:44:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQVu-0004CR-CP for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwQVu-00088r-3L for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nwQVu-0001WS-1X for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55752] [PATCH 1/5] edit: Extract 'spawn-editor' procedure. References: <20220601154140.16178-1-ludo@gnu.org> In-Reply-To: <20220601154140.16178-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jun 2022 15:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55752 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55752@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 55752-submit@debbugs.gnu.org id=B55752.16540982015752 (code B ref 55752); Wed, 01 Jun 2022 15:44:01 +0000 Received: (at 55752) by debbugs.gnu.org; 1 Jun 2022 15:43:21 +0000 Received: from localhost ([127.0.0.1]:51640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQVF-0001Uh-9Y for submit@debbugs.gnu.org; Wed, 01 Jun 2022 11:43:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQVD-0001U8-1r for 55752@debbugs.gnu.org; Wed, 01 Jun 2022 11:43:19 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37370) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQV5-00083E-DL; Wed, 01 Jun 2022 11:43:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=q4GMJVRvZUusTmNcjc3CT9qCqODFhQBFpXZ+NWSBu/Y=; b=KSaWhV8euNZhIe Kj1OgQWNWTyn1+3JEjD6icSEoeQKf2npTSi3OIH8tpbJ6lQfpUM903byAggm8wwiIEti75N+qTbJC DBoAqHPsulWAkve4L3K6ivtCwOwcto/erb1CTTbiyfmGXLDrsRMHYImh+M9+dMXMzTLSl1jSklGPR F9V7JlZY7XBeKpX0nXDS0SL6SQ8mdvch9lCqpvzE1bSy7CAVACkTaCm+0dm2kNW1w7gipVHQGMysx K8pBqDjeWiojFznn2QHEJG92s+WaQaKGUlCgTZtqNEsjx+gL01reLCTW158YqZ/WgBcvRnutpCPvI VLKFoGdjkjUCSjN7LWCQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:55618 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwQV5-0006Xy-0f; Wed, 01 Jun 2022 11:43:11 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 1 Jun 2022 17:42:58 +0200 Message-Id: <20220601154302.16222-1-ludo@gnu.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/edit.scm (spawn-editor): New procedure, with code from... (guix-edit): ... here. Use it. --- guix/scripts/edit.scm | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/guix/scripts/edit.scm b/guix/scripts/edit.scm index a2e1ffb434..8e777d1405 100644 --- a/guix/scripts/edit.scm +++ b/guix/scripts/edit.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2015-2016, 2019-2022 Ludovic Courtès ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2020, 2021 Simon Tournier ;;; @@ -27,6 +27,7 @@ (define-module (guix scripts edit) #:use-module (srfi srfi-1) #:use-module (srfi srfi-37) #:export (%editor + spawn-editor guix-edit)) (define %options @@ -77,6 +78,21 @@ (define (location->location-specification location) (location-line location))) (search-path* %load-path (location-file location)))) +(define (spawn-editor locations) + "Spawn (%editor) to edit the code at LOCATIONS, a list of +records, and exit." + (catch 'system-error + (lambda () + (let ((file-names (append-map location->location-specification + locations))) + ;; Use `system' instead of `exec' in order to sanely handle + ;; possible command line arguments in %EDITOR. + (exit (system (string-join (cons (%editor) file-names)))))) + (lambda args + (let ((errno (system-error-errno args))) + (leave (G_ "failed to launch '~a': ~a~%") + (%editor) (strerror errno)))))) + (define-command (guix-edit . args) (category packaging) @@ -94,14 +110,4 @@ (define (parse-arguments) (when (null? specs) (leave (G_ "no packages specified, nothing to edit~%"))) - (catch 'system-error - (lambda () - (let ((file-names (append-map location->location-specification - locations))) - ;; Use `system' instead of `exec' in order to sanely handle - ;; possible command line arguments in %EDITOR. - (exit (system (string-join (cons (%editor) file-names)))))) - (lambda args - (let ((errno (system-error-errno args))) - (leave (G_ "failed to launch '~a': ~a~%") - (%editor) (strerror errno)))))))) + (spawn-editor locations)))) From patchwork Wed Jun 1 15:42:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 2771 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 4F20F27BBEA; Wed, 1 Jun 2022 16:44:16 +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=unavailable 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 6764F27BBE9 for ; Wed, 1 Jun 2022 16:44:15 +0100 (BST) Received: from localhost ([::1]:57872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwQW6-0004Hl-JD for patchwork@mira.cbaines.net; Wed, 01 Jun 2022 11:44:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQVw-0004DW-7f for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57755) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwQVv-00089O-VH for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nwQVv-0001Wv-TX for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55752] [PATCH 2/5] guix system: Add 'edit' sub-command. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jun 2022 15:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55752 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55752@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 55752-submit@debbugs.gnu.org id=B55752.16540982145798 (code B ref 55752); Wed, 01 Jun 2022 15:44:03 +0000 Received: (at 55752) by debbugs.gnu.org; 1 Jun 2022 15:43:34 +0000 Received: from localhost ([127.0.0.1]:51648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQVR-0001VS-C4 for submit@debbugs.gnu.org; Wed, 01 Jun 2022 11:43:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQVB-0001U6-UX for 55752@debbugs.gnu.org; Wed, 01 Jun 2022 11:43:32 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37372) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQV6-00083L-3R; Wed, 01 Jun 2022 11:43:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=QeNAsQARHOufoDHOXsXydFuwIE7ZOGejvu+i9hkE+eE=; b=WpjnjWgjkZrKPBXH+k6x /6XW2QrZapHV87jtwA13bSBeBsF4Sbk0eoi318+lhoz9fr0aU8OE343+JdT/DwJWxrIIaQZ6eebz9 TH18thaoqC/pi1igX7EYmyX+jP25sIBaFRIMjOdAQVTw21f8vrzVvQc5UunsoqfuMCFuHPPAv2E5y tz6CjpGQqhsLN6JciZbUhFzdffZ768svNPPRogwOGicy1ARBfc6p1oaioZUbV4P44qFxLKNPpWOX/ SEqz0xhZHzQlXKHg6IUx6W/Vqkm3UZ7Z2u4b9ddyGwDRxXMb4t/hcuUTtOfPsuJC9q+I9mhsXVYdq cX/6xkylsV2XOg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:55618 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwQV5-0006Xy-Jd; Wed, 01 Jun 2022 11:43:11 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 1 Jun 2022 17:42:59 +0200 Message-Id: <20220601154302.16222-2-ludo@gnu.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220601154302.16222-1-ludo@gnu.org> References: <20220601154302.16222-1-ludo@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/system/edit.scm: New file. * Makefile.am (MODULES): Add it. * guix/scripts/system.scm (show-help): Mention "edit". (actions): Add it. (process-command): Handle it. * doc/guix.texi (Invoking guix system): Document it. * po/guix/POTFILES.in: Add guix/scripts/system/edit.scm. --- Makefile.am | 3 +- doc/guix.texi | 13 ++++++++ guix/scripts/system.scm | 7 +++- guix/scripts/system/edit.scm | 64 ++++++++++++++++++++++++++++++++++++ po/guix/POTFILES.in | 1 + 5 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 guix/scripts/system/edit.scm diff --git a/Makefile.am b/Makefile.am index 968bde8131..f585d00b86 100644 --- a/Makefile.am +++ b/Makefile.am @@ -308,8 +308,9 @@ MODULES = \ guix/scripts/describe.scm \ guix/scripts/style.scm \ guix/scripts/system.scm \ - guix/scripts/system/search.scm \ + guix/scripts/system/edit.scm \ guix/scripts/system/reconfigure.scm \ + guix/scripts/system/search.scm \ guix/scripts/home.scm \ guix/scripts/home/import.scm \ guix/scripts/lint.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 88e009fe7c..ecd99084ef 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -36617,6 +36617,19 @@ As for @command{guix package --search}, the result is written in @code{recutils} format, which makes it easy to filter the output (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual}). +@cindex service type definition, editing +@cindex editing, service type definition +@item edit +Edit or view the definition of the given service types. + +For example, the command below opens your editor, as specified by the +@env{EDITOR} environment variable, on the definition of the +@code{openssh} service type: + +@example +guix system edit openssh +@end example + @item reconfigure Build the operating system described in @var{file}, activate it, and switch to it@footnote{This action (and the related actions diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index eaa245eb44..261a1d226d 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -944,6 +944,8 @@ (define (show-help) (newline) (display (G_ "\ search search for existing service types\n")) + (display (G_ "\ + edit edit the definition of an existing service type\n")) (display (G_ "\ reconfigure switch to a new operating system configuration\n")) (display (G_ "\ @@ -1172,7 +1174,8 @@ (define actions '("build" "container" "vm" "vm-image" "image" "disk-image" "extension-graph" "shepherd-graph" "list-generations" "describe" "delete-generations" "roll-back" - "switch-generation" "search" "docker-image")) + "switch-generation" "search" "edit" + "docker-image")) (define (process-action action args opts) "Process ACTION, a sub-command, with the arguments are listed in ARGS. @@ -1340,6 +1343,8 @@ (define-syntax-rule (with-store* store exp ...) (display-system-generation generation)))) ((search) (apply (resolve-subcommand "search") args)) + ((edit) + (apply (resolve-subcommand "edit") args)) ;; The following commands need to use the store, but they do not need an ;; operating system configuration file. ((delete-generations) diff --git a/guix/scripts/system/edit.scm b/guix/scripts/system/edit.scm new file mode 100644 index 0000000000..d966ee0aaa --- /dev/null +++ b/guix/scripts/system/edit.scm @@ -0,0 +1,64 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix scripts system edit) + #:use-module (guix diagnostics) + #:use-module (guix i18n) + #:use-module (guix ui) + #:autoload (guix utils) (string-closest) + #:use-module (gnu services) + #:use-module (srfi srfi-1) + #:use-module (ice-9 match) + #:autoload (guix scripts edit) (spawn-editor) + #:export (guix-system-edit)) + +(define (service-type-not-found type) + "Report an error about @var{type} not being found and exit." + (report-error (G_ "~a: no such service type~%") type) + + (let* ((type (symbol->string type)) + (available (fold-service-types (lambda (type lst) + (cons (symbol->string + (service-type-name type)) + lst)) + '())) + (closest (string-closest type available))) + (unless (or (not closest) (string=? closest type)) + (display-hint (format #f (G_ "Did you mean @code{~a}?~%") + closest)))) + + (exit 1)) + + +(define (guix-system-edit . args) + (when (null? args) + (leave (G_ "no service types specified, nothing to edit~%"))) + + (let* ((types (append-map (lambda (type) + (let ((type (string->symbol type))) + (match (lookup-service-types type) + (() (service-type-not-found type)) + ((one) (list one)) + (lst + (warning (N_ "~a: ~a matching service type~%" + "~a: ~a matching service types~%" + (length lst)) + type (length lst)) + lst)))) + args))) + (spawn-editor (filter-map service-type-location types)))) diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 49a8edfef3..5ad3c9f0a8 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -87,6 +87,7 @@ guix/scripts/pull.scm guix/scripts/substitute.scm guix/scripts/authenticate.scm guix/scripts/system.scm +guix/scripts/system/edit.scm guix/scripts/system/search.scm guix/scripts/lint.scm guix/scripts/publish.scm From patchwork Wed Jun 1 15:43:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 2768 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 CDB0027BBEA; Wed, 1 Jun 2022 16:44:12 +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=unavailable 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 514D727BBE9 for ; Wed, 1 Jun 2022 16:44:12 +0100 (BST) Received: from localhost ([::1]:57758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwQW3-0004Cw-DH for patchwork@mira.cbaines.net; Wed, 01 Jun 2022 11:44:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48342) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQVu-0004Ca-SU for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwQVu-00088x-Jw for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nwQVu-0001WZ-Hs for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55752] [PATCH 3/5] home: services: Add 'lookup-home-service-types' procedure. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jun 2022 15:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55752 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55752@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 55752-submit@debbugs.gnu.org id=B55752.16540982025760 (code B ref 55752); Wed, 01 Jun 2022 15:44:02 +0000 Received: (at 55752) by debbugs.gnu.org; 1 Jun 2022 15:43:22 +0000 Received: from localhost ([127.0.0.1]:51642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQVF-0001Uj-Lx for submit@debbugs.gnu.org; Wed, 01 Jun 2022 11:43:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQVD-0001U9-1v for 55752@debbugs.gnu.org; Wed, 01 Jun 2022 11:43:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37376) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQV6-00083U-JB; Wed, 01 Jun 2022 11:43:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=X9tthBaSnp2/5Ds8iMjYN9aqAm7N11KC5LZ/OloCTVo=; b=XU+bYlAnTm/LTm+hTI4Z +yJ6eLw4q6SQVi7H2yYCunEEyD6zDqRHaMM/octcTE7WwCyqGxymLYe4HT8xNtyGyrNT6lHEnicct 650pzBkC5Dw1AwsDRYzc4y59rYVy6kk/WIuKG+1XQE5ORHca5yetRVOuMa+nHJqMfpk8Itkup4LRL uEngd2xSTHynbd1glBr5XI+t9A5M89Uu9e8NwkSpiSzJavUhmWvAN5gzkjAdYEE9oEGHNyTRODZi5 3d4iJHcIhkVVDybpvRW2dKKpipLy1daO1TDV/AB6Yaps0Sd9cCpCSkC2R08e2NBEZWJhEF6VX5S2L oB8IjcJfgAgsUQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:55618 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwQV6-0006Xy-6e; Wed, 01 Jun 2022 11:43:12 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 1 Jun 2022 17:43:00 +0200 Message-Id: <20220601154302.16222-3-ludo@gnu.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220601154302.16222-1-ludo@gnu.org> References: <20220601154302.16222-1-ludo@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/home/services.scm (lookup-home-service-types): New procedure. * tests/home-services.scm: New file. * Makefile.am (SCM_TESTS): Add it. --- Makefile.am | 1 + gnu/home/services.scm | 12 +++++++++++ tests/home-services.scm | 46 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 tests/home-services.scm diff --git a/Makefile.am b/Makefile.am index f585d00b86..89bc03c9a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -497,6 +497,7 @@ SCM_TESTS = \ tests/gremlin.scm \ tests/hackage.scm \ tests/home-import.scm \ + tests/home-services.scm \ tests/http-client.scm \ tests/import-git.scm \ tests/import-github.scm \ diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 8284a4f3fc..5ee3357792 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -33,6 +33,7 @@ (define-module (gnu home services) #:use-module (guix modules) #:use-module (srfi srfi-1) #:use-module (ice-9 match) + #:use-module (ice-9 vlist) #:export (home-service-type home-profile-service-type @@ -50,6 +51,7 @@ (define-module (gnu home services) xdg-data-files-directory fold-home-service-types + lookup-home-service-types home-provenance %initialize-gettext) @@ -605,3 +607,13 @@ (define (all-home-service-modules) (define* (fold-home-service-types proc seed) (fold-service-types proc seed (all-home-service-modules))) + +(define lookup-home-service-types + (let ((table + (delay (fold-home-service-types (lambda (type result) + (vhash-consq (service-type-name type) + type result)) + vlist-null)))) + (lambda (name) + "Return the list of services with the given NAME (a symbol)." + (vhash-foldq* cons '() name (force table))))) diff --git a/tests/home-services.scm b/tests/home-services.scm new file mode 100644 index 0000000000..e13733cabd --- /dev/null +++ b/tests/home-services.scm @@ -0,0 +1,46 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (test-home-services) + #:use-module (gnu services) + #:use-module (gnu home services) + #:use-module (guix diagnostics) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-64) + #:use-module (ice-9 match)) + +(test-begin "home-services") + +(test-assert "fold-home-service-types" + (match (fold-home-service-types cons '()) + (() #f) + (lst (and (every service-type? lst) + (every (lambda (type) + (let ((location (service-type-location type))) + (string-contains (location-file location) + "gnu/home"))) + lst))))) + +(test-eq "lookup-service-types" + home-files-service-type + (and (null? (lookup-home-service-types 'does-not-exist-at-all)) + (match (lookup-home-service-types 'home-files) + ((one) one) + (x x)))) + +(test-end) From patchwork Wed Jun 1 15:43:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 2772 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 A618327BBEA; Wed, 1 Jun 2022 16:44:23 +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=unavailable 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 0B7C427BBE9 for ; Wed, 1 Jun 2022 16:44:23 +0100 (BST) Received: from localhost ([::1]:58640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwQWE-0004oo-8D for patchwork@mira.cbaines.net; Wed, 01 Jun 2022 11:44:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQVv-0004Cu-Nv for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57754) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwQVv-00089H-FQ for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nwQVv-0001Wo-E1 for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55752] [PATCH 4/5] guix home: Add 'edit' sub-command. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jun 2022 15:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55752 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55752@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 55752-submit@debbugs.gnu.org id=B55752.16540982055776 (code B ref 55752); Wed, 01 Jun 2022 15:44:03 +0000 Received: (at 55752) by debbugs.gnu.org; 1 Jun 2022 15:43:25 +0000 Received: from localhost ([127.0.0.1]:51646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQVI-0001V5-Ns for submit@debbugs.gnu.org; Wed, 01 Jun 2022 11:43:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQVD-0001UB-4s for 55752@debbugs.gnu.org; Wed, 01 Jun 2022 11:43:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37378) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQV7-00083j-J4; Wed, 01 Jun 2022 11:43:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=hB6UdHO4kLKbRLbFkZYAcj0iaEZ0Q/8LQCCgPMtOugk=; b=L4ASrSDaQOKdY2ZBIcF6 Rm6VQZV0GR0vQJBU0/lv1qODKi4N2vt8yPtoTSr3+ziNWuJsJGWb62nIKez5L+0NJCCDaPKRkRk/w AtmwClWYjTh6vSAE6vdeuRSNSAyHBnssNF93mk1lSbNH6IsAgO9xXJI2BeDP7REUqzlvLMECY+Ipn 6hZ5hlU4XGriHE9jZnm+wYSE313lIpaKnlYu5DrV714MQ4cC7m6hTYiHfEr4iECDXfwRdMa9Gh4uH V6nGMgCnZk0ce77vDVAq8ApyxSZKu7KBs3L0w13hRTtmGKx+653O+jl81CulncwBCSn2JzCgCM4Te SX2bxvASr+F4Eg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:55618 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwQV7-0006Xy-3F; Wed, 01 Jun 2022 11:43:13 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 1 Jun 2022 17:43:01 +0200 Message-Id: <20220601154302.16222-4-ludo@gnu.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220601154302.16222-1-ludo@gnu.org> References: <20220601154302.16222-1-ludo@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/home/edit.scm: New file. * Makefile.am (MODULES): Add it. * guix/scripts/home.scm (show-help): Add "edit". (process-command): Handle it. (guix-home): Add it. * po/guix/POTFILES.in: Add 'guix/scripts/home/edit.scm'. * doc/guix.texi (Invoking guix home): Document it. --- Makefile.am | 1 + doc/guix.texi | 13 ++++++++ guix/scripts/home.scm | 7 +++- guix/scripts/home/edit.scm | 66 ++++++++++++++++++++++++++++++++++++++ po/guix/POTFILES.in | 1 + 5 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 guix/scripts/home/edit.scm diff --git a/Makefile.am b/Makefile.am index 89bc03c9a2..e8d4b7ef8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -312,6 +312,7 @@ MODULES = \ guix/scripts/system/reconfigure.scm \ guix/scripts/system/search.scm \ guix/scripts/home.scm \ + guix/scripts/home/edit.scm \ guix/scripts/home/import.scm \ guix/scripts/lint.scm \ guix/scripts/challenge.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index ecd99084ef..f85eaacdfa 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -39466,6 +39466,19 @@ guix home container config.scm -- herd status The command to run in the container must come after @code{--} (double hyphen). +@cindex service type definition, editing +@cindex editing, service type definition +@item edit +Edit or view the definition of the given Home service types. + +For example, the command below opens your editor, as specified by the +@env{EDITOR} environment variable, on the definition of the +@code{home-mcron} service type: + +@example +guix home edit home-mcron +@end example + @item reconfigure Build the home environment described in @var{file}, and switch to it. Switching means that the activation script will be evaluated and (in diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index f43bf865a7..0f5c3388a1 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -60,6 +60,7 @@ (define-module (guix scripts home) #:autoload (guix scripts pull) (channel-commit-hyperlink) #:autoload (guix scripts system) (service-node-type shepherd-service-node-type) + #:autoload (guix scripts home edit) (guix-home-edit) #:autoload (guix scripts home import) (import-manifest) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module ((guix build utils) #:select (mkdir-p)) @@ -93,6 +94,8 @@ (define (show-help) (newline) (display (G_ "\ search search for existing service types\n")) + (display (G_ "\ + edit edit the definition of an existing service type\n")) (display (G_ " container run the home environment configuration in a container\n")) (display (G_ "\ @@ -539,6 +542,8 @@ (define-syntax-rule (with-store* store exp ...) ;; an home environment file. ((search) (apply search args)) + ((edit) + (apply guix-home-edit args)) ((import) (let* ((profiles (delete-duplicates (match (filter-map (match-lambda @@ -611,7 +616,7 @@ (define (parse-sub-command arg result) extension-graph shepherd-graph list-generations describe delete-generations roll-back - switch-generation search + switch-generation search edit import container) (alist-cons 'action action result)) (else (leave (G_ "~a: unknown action~%") action)))))) diff --git a/guix/scripts/home/edit.scm b/guix/scripts/home/edit.scm new file mode 100644 index 0000000000..a6c05675b3 --- /dev/null +++ b/guix/scripts/home/edit.scm @@ -0,0 +1,66 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix scripts home edit) + #:use-module (guix diagnostics) + #:use-module (guix i18n) + #:use-module (guix ui) + #:autoload (guix utils) (string-closest) + #:use-module (gnu services) + #:use-module (gnu home services) + #:use-module (srfi srfi-1) + #:use-module (ice-9 match) + #:autoload (guix scripts edit) (spawn-editor) + #:export (guix-home-edit)) + +(define (service-type-not-found type) + "Report an error about @var{type} not being found and exit." + (report-error (G_ "~a: no such service type~%") type) + + (let* ((type (symbol->string type)) + (available (fold-home-service-types (lambda (type lst) + (cons (symbol->string + (service-type-name type)) + lst)) + '())) + (closest (string-closest type available))) + (unless (or (not closest) (string=? closest type)) + (display-hint (format #f (G_ "Did you mean @code{~a}?~%") + closest)))) + + (exit 1)) + + +(define (guix-home-edit . args) + (when (null? args) + (leave (G_ "no service types specified, nothing to edit~%"))) + + (with-error-handling + (let* ((types (append-map (lambda (type) + (let ((type (string->symbol type))) + (match (lookup-home-service-types type) + (() (service-type-not-found type)) + ((one) (list one)) + (lst + (warning (N_ "~a: ~a matching service type~%" + "~a: ~a matching service types~%" + (length lst)) + type (length lst)) + lst)))) + args))) + (spawn-editor (filter-map service-type-location types))))) diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 5ad3c9f0a8..6b8bd92bb7 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -125,6 +125,7 @@ guix/scripts/archive.scm guix/scripts/build.scm guix/scripts/discover.scm guix/scripts/environment.scm +guix/scripts/home/edit.scm guix/scripts/home/import.scm guix/scripts/home.scm guix/scripts/time-machine.scm From patchwork Wed Jun 1 15:43:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 2770 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 30E3927BBEB; Wed, 1 Jun 2022 16:44:16 +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=unavailable 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 C3B8127BBEA for ; Wed, 1 Jun 2022 16:44:15 +0100 (BST) Received: from localhost ([::1]:57918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwQW6-0004JU-VH for patchwork@mira.cbaines.net; Wed, 01 Jun 2022 11:44:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQVv-0004Cm-Dr for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwQVv-000893-5S for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nwQVv-0001Wg-0P for guix-patches@gnu.org; Wed, 01 Jun 2022 11:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55752] [PATCH 5/5] DRAFT news: Add entry for 'guix system edit' and 'guix home edit'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jun 2022 15:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55752 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55752@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 55752-submit@debbugs.gnu.org id=B55752.16540982025766 (code B ref 55752); Wed, 01 Jun 2022 15:44:02 +0000 Received: (at 55752) by debbugs.gnu.org; 1 Jun 2022 15:43:22 +0000 Received: from localhost ([127.0.0.1]:51644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQVG-0001Ur-AG for submit@debbugs.gnu.org; Wed, 01 Jun 2022 11:43:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQVD-0001UC-BG for 55752@debbugs.gnu.org; Wed, 01 Jun 2022 11:43:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37380) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQV8-00083p-3f; Wed, 01 Jun 2022 11:43:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=ZDrWno+zqHqD8EsnSSMP/9ELYmoVlYTXU4usM+QwLvs=; b=V+5hSiCTA1yqa3BMZl8i el3quZFwi0Hsv4V5Y86J4H8i0gofBbIA7ey6oNf2qeuiD/liWbh6oDU1w32z2py2CYCz6j0Wuu354 kWe9/evT4TaXJTJgxr11U+nt+wV7bgYQ3OBEyOPU58gNagITt6ngvYjg8Ceetz4fhJjOrjGTdV+c7 /8eJZA9GJRQDVIJ4lkzigZ9Ap9ZsIrvPMD/Eshj/zfsZlFXeC6wxEUD3PgYQjRgLnYWrQ3WXr1qLY 0Qkax+gX90p2vlPvXcIpjpTwq2KnEC8Rp3oJvuurjbRNcw8987PY6ehCNul9C7YdMsjjmk/mStG2j L5vIX2eYWQfzjw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:55618 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwQV7-0006Xy-M0; Wed, 01 Jun 2022 11:43:13 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 1 Jun 2022 17:43:02 +0200 Message-Id: <20220601154302.16222-5-ludo@gnu.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220601154302.16222-1-ludo@gnu.org> References: <20220601154302.16222-1-ludo@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches DRAFT: Add correct commit ID before pushing. * etc/news.scm: Add entry. --- etc/news.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index a74ca94b8a..70ef607911 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -25,6 +25,34 @@ (channel-news (version 0) + (entry (commit "XXX") + (title + (en "New @command{edit} sub-commands for services") + (fr "Nouvelles commandes @command{edit} pour les services")) + (body + (en "The new @command{guix system edit} and @command{guix home edit} commands +allow you to view or edit service types defined for Guix System or Guix Home. +For example, here is how you would open the definition of the OpenSSH system +service: + +@example +guix system edit openssh +@end example + +Run @command{info \"(guix) Invoking guix system\"} or @command{info \"(guix) +Invoking guix home\"} for more info.") + (fr "Les nouvelles commandes @command{guix system edit} et +@command{guix home edit} permettent de visualiser ou d'éditer les types de +services définis pour Guix System ou Guix Home. Par exemple, voici comment +ouvrir la définition du service système OpenSSH : + +@example +guix system edit openssh +@end example + +Lancer @command{info \"(guix.fr) Invoquer guix system\"} ou @command{info +\"(guix.fr) Invoquer guix home\"} pour plus d'informations."))) + (entry (commit "903c82583e1cec4c9ff09d5895c5cc646c37b661") (title (en "New @command{guix import elm} command")