From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id mCbFOlCJl2JRnAAAbAwnHQ (envelope-from ) for ; Wed, 01 Jun 2022 17:44:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id mCzKOVCJl2LMUgEAG6o9tA (envelope-from ) for ; Wed, 01 Jun 2022 17:44:16 +0200 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 90EBD94D3 for ; Wed, 1 Jun 2022 17:44:16 +0200 (CEST) Received: from localhost ([::1]:57872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwQW7-0004Hl-Gx for larch@yhetil.org; Wed, 01 Jun 2022 11:44:15 -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 Content-Type: text/plain; charset=UTF-8 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-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1654098256; 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=uG9aDEcCDFntgkKxb1gaol6EBPJ+gNeCVqKJKvcR8gI=; b=dmkXLsjpLh7JVxfSriATV/+R9rE37R5wgSILWWoWcTTqsLXKN8rWEyaDp7HNEO3+F+YBmd PqypsTPjGMLwL6+ZB2evePk4V7HCVMoq12mmzjApg+oxEl1l8kDXL39moD08zMsBcbBvtu R0G4ACBAlM9cGi/lAflRPhBQ99vy1qDdk4FVuaXRdUTYm+x8QPt3UPSbMEMahMcirgBwVX OJ4PHzJmx9QzqqoNdA5q5z2lpT+yglySQKCN1GIsW0PUYVn9gRhujr7JdfQ21BjDoRKA6S vfAU1xwRgsZBUVt9d/Yh8RSN7Hf9yPQVjkvv9973JKWzjoWDFnqbXxc96fhA5g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654098256; a=rsa-sha256; cv=none; b=Ooxk51a0neOueEfVGXUGISK+W49QC94bHTu/qiSBXi8WpJJmgo4EmmkmdtA0dxx3jKaVhB B1kmeR8QbTTzYd9wPbk1wZLWxATTO2GAGqAqSbSjJRMbC626TSn8d9wEysBVDNwEVGiwKF 6WW1vdimr1a32YoWgmCWBNaxj8mkX5eEVrSgjgsYjBqWxl8C3ujKF+JXszsLSfZ6Us/4/B iFZ/WpuXL0EjqZUAwWw/+S/sNyVR+p2Y9ErEyB3LUNyG50df+7X0eTlFmCjbnWjs0n2JX1 Nm8uG+03fMwZz/aHW72uyiMiDqH4ctbri30y1xBvYO7v/085A1yJbNGLBenYhQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=WpjnjWgj; dmarc=pass (policy=none) header.from=gnu.org; 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: -3.43 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gnu.org header.s=fencepost-gnu-org header.b=WpjnjWgj; dmarc=pass (policy=none) header.from=gnu.org; 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: 90EBD94D3 X-Spam-Score: -3.43 X-Migadu-Scanner: scn0.migadu.com X-TUID: R0v835ikwSOV * 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 -- 2.36.1