From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 01 11:41:59 2022 Received: (at submit) by debbugs.gnu.org; 1 Jun 2022 15:41:59 +0000 Received: from localhost ([127.0.0.1]:51620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQTo-0001QS-Un for submit@debbugs.gnu.org; Wed, 01 Jun 2022 11:41:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:34270) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwQTm-0001QI-Fi for submit@debbugs.gnu.org; Wed, 01 Jun 2022 11:41:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQTm-00024i-95 for guix-patches@gnu.org; Wed, 01 Jun 2022 11:41:50 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37346) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwQTm-0007up-03; Wed, 01 Jun 2022 11:41:50 -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=iX/5SyJnF8X7BigEUSCPA67z6KGYC2d8EPGLt+KJQZY=; b=fLE+pWibOls7/0 n+tXjc6UV5f461LWPIlW10cYEox5eJiLd0kPi47/81u6RGdc97zwthjqOHsyc8Ctziq2SA8SUhFXJ 0SHSva/63rW2DvLpjqhSPJJfyGFtQLWu7HOyghY71Hqkj1ppOTC8Y6EfrNqiFmUo1jvI93TQiBWzd MyEyBg42hPMBPXybtCdBOyhqB5Tu71IKqbhKvi5XQgjHnSRmnFjPnJc8cQrnOC2yMMI6t6A0rjDV3 /Q5VIOCKYWUDyFl1TdKKnaf0tgS37QJ3C2+VsnpmqqiBlu/FkidzyvHgjsXwPPlX0JoNa9YsO8E8D QgMR4BAcypV0xESFbnPQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:50159 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 1nwQTl-0006TP-Jj; Wed, 01 Jun 2022 11:41:49 -0400 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH 0/5] Add 'guix system edit' and 'guix home edit' Date: Wed, 1 Jun 2022 17:41:40 +0200 Message-Id: <20220601154140.16178-1-ludo@gnu.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Guix! This is the long-overdue addition of ‘guix system edit’ and ‘guix home edit’ to edit service type definitions. Thoughts? Ludo’. Ludovic Courtès (5): edit: Extract 'spawn-editor' procedure. guix system: Add 'edit' sub-command. home: services: Add 'lookup-home-service-types' procedure. guix home: Add 'edit' sub-command. DRAFT news: Add entry for 'guix system edit' and 'guix home edit'. Makefile.am | 5 ++- doc/guix.texi | 26 ++++++++++++++ etc/news.scm | 28 +++++++++++++++ gnu/home/services.scm | 12 +++++++ guix/scripts/edit.scm | 30 +++++++++------- guix/scripts/home.scm | 7 +++- guix/scripts/home/edit.scm | 66 ++++++++++++++++++++++++++++++++++++ guix/scripts/system.scm | 7 +++- guix/scripts/system/edit.scm | 64 ++++++++++++++++++++++++++++++++++ po/guix/POTFILES.in | 2 ++ tests/home-services.scm | 46 +++++++++++++++++++++++++ 11 files changed, 278 insertions(+), 15 deletions(-) create mode 100644 guix/scripts/home/edit.scm create mode 100644 guix/scripts/system/edit.scm create mode 100644 tests/home-services.scm base-commit: fed51b26141548a5bae349a5e1d8d6f681320f4f -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 01 11:43:21 2022 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: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 55752@debbugs.gnu.org Subject: [PATCH 1/5] edit: Extract 'spawn-editor' procedure. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 55752 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)))) -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 01 11:43:22 2022 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: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 55752@debbugs.gnu.org Subject: [PATCH 3/5] home: services: Add 'lookup-home-service-types' procedure. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 55752 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 01 11:43:22 2022 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: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 55752@debbugs.gnu.org Subject: [PATCH 5/5] DRAFT news: Add entry for 'guix system edit' and 'guix home edit'. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 55752 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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") -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 01 11:43:25 2022 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: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 55752@debbugs.gnu.org Subject: [PATCH 4/5] guix home: Add 'edit' sub-command. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 55752 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.36.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 01 11:43:34 2022 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: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: 55752@debbugs.gnu.org Subject: [PATCH 2/5] guix system: Add 'edit' sub-command. 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-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 55752 Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 02 07:41:37 2022 Received: (at 55752) by debbugs.gnu.org; 2 Jun 2022 11:41:37 +0000 Received: from localhost ([127.0.0.1]:52960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwjCr-00040A-LW for submit@debbugs.gnu.org; Thu, 02 Jun 2022 07:41:37 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:50382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwjCp-0003zy-BZ for 55752@debbugs.gnu.org; Thu, 02 Jun 2022 07:41:36 -0400 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by laurent.telenet-ops.be with bizsmtp id eBhZ2700D4UW6Th01BhZnh; Thu, 02 Jun 2022 13:41:33 +0200 Message-ID: <4a0e1ddf5755f8e612a7a16f3419838af7138edf.camel@telenet.be> Subject: Re: [bug#55752] [PATCH 5/5] DRAFT news: Add entry for 'guix system edit' and 'guix home edit'. From: Maxime Devos To: Ludovic =?ISO-8859-1?Q?Court=E8s?= , 55752@debbugs.gnu.org Date: Thu, 02 Jun 2022 13:41:26 +0200 In-Reply-To: <20220601154302.16222-5-ludo@gnu.org> References: <20220601154302.16222-1-ludo@gnu.org> <20220601154302.16222-5-ludo@gnu.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-+sGlP7BQ3T5vA8K8fdS4" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1654170093; bh=bmruQcWYFqWnoAte7A40en4Z8KzZWhaUbnQoegf7ocw=; h=Subject:From:To:Date:In-Reply-To:References; b=ZfBAGC1SfaGbmuC7zmZY1PBtpG0uQe/myYg5wdUVihuVu9zw+nagsKMtEDeuwPgxG KEQHhdZ+2I6uLq7DYALh4URi3hcD4wHWYTlMAriPVm6sVSbTHO8sio9DDxCuz0GU/C kO/nmAdgQIJV1IrCKdIvQIAyN9gXrH5mAtclJ94+eAwNtwmEx5MqwPXtbBQpXsiZl0 zib03/Nno6FEzWNYpa5ifSpenQfQVpR0MfZkRqENEI2xUxt9aIMJQnGCboZ4SwUy3x wS5PAZxqkLbfQEPimIrx3iQ7/OF0xro+Jz+56OXMFAkOPU9hqn18hJVy38QRdqPSXG Vma0yyHfKPy7w== X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 55752 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-+sGlP7BQ3T5vA8K8fdS4 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s schreef op wo 01-06-2022 om 17:43 [+0200]: > + (entry (commit "XXX") > + (title > + (en "New @command{edit} sub-commands for services") > + (fr "Nouvelles commandes @command{edit} pour les services")) (nl "Nieuwe deelopdracht @command{edit} voor diensten) (body ;; TODO: pas verwijzingen naar de handleiding aan wanneer ze vertaald is (nl "Met de nieuwe bewerkingen @command{guix system edit} en @command{guix home edit} kan je dienstsoorten van Guix System en Guix Home bekijken en bewerken. Je kan bijvoorbeeld de definitie van de systeemdienst OpenSSH als volgt openen: @example guix system edit openssh @end example. Voer @command{info \"(guix) Invoking guix system\"} of @command{info \"(guix)Invoking guix home\"} uit voor meer informatie.") --=-+sGlP7BQ3T5vA8K8fdS4 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYpih5hccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7oFmAP9tkGn3IJ6U7rNiJaHX6wRnaC3M lpdEzrZJKwmsRzGjpAEAsjeKpNB3zif/FxIRHhInysVY/xagJfFS5GgaIGYKcAk= =GkHt -----END PGP SIGNATURE----- --=-+sGlP7BQ3T5vA8K8fdS4-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 02 09:26:34 2022 Received: (at 55752) by debbugs.gnu.org; 2 Jun 2022 13:26:34 +0000 Received: from localhost ([127.0.0.1]:53134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwkqA-0007Ig-UD for submit@debbugs.gnu.org; Thu, 02 Jun 2022 09:26:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwkq7-0007IO-Qd for 55752@debbugs.gnu.org; Thu, 02 Jun 2022 09:26:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwkq1-0000Oq-I3; Thu, 02 Jun 2022 09:26:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=cmPWcTx0jhBg46kLW1sy5MWEP6GuAkacR6d906dL3tY=; b=kFCqj6AnVw+9BWJOfdkq uVFcsBTFzJkslAWzqVZ95/NizWQF97a9sL5vqmIP9OVNUYi3rO9j6ibuwPbiXQSoaPmbwGMijzY5F kcNuxuswaQd5IBpqxeZAynQmtCUlDC+z5Q64L0eUeQ0qPhqWNU/zlMEwCL8cdmg2xASQVQMwOtK6a lNa939ehLRER78K1ulDshR08tE/0cdHebvAu0s++vFCr/UPwJkj/0zhBfmz9kt1DHQQYiZeIgZARX dDAaKRR+lWUP/z7Tqh1CUIp62E542DblEFZD5Wpxg64HeEVFjEa/H3BcplV65ktPfildSbfUIni8g s3+I/HHcw562mQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:58758 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwkq0-0001sg-I2; Thu, 02 Jun 2022 09:26:09 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maxime Devos Subject: Re: [bug#55752] [PATCH 5/5] DRAFT news: Add entry for 'guix system edit' and 'guix home edit'. References: <20220601154302.16222-1-ludo@gnu.org> <20220601154302.16222-5-ludo@gnu.org> <4a0e1ddf5755f8e612a7a16f3419838af7138edf.camel@telenet.be> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Quartidi 14 Prairial an 230 de la =?utf-8?Q?R=C3=A9v?= =?utf-8?Q?olution=2C?= jour de l'Acacia X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 02 Jun 2022 15:26:06 +0200 In-Reply-To: <4a0e1ddf5755f8e612a7a16f3419838af7138edf.camel@telenet.be> (Maxime Devos's message of "Thu, 02 Jun 2022 13:41:26 +0200") Message-ID: <87y1yfp575.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 55752 Cc: 55752@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Goeden dag! Maxime Devos skribis: > Ludovic Court=C3=A8s schreef op wo 01-06-2022 om 17:43 [+0200]: >> + (entry (commit "XXX") >> + (title >> + (en "New @command{edit} sub-commands for services") >> + (fr "Nouvelles commandes @command{edit} pour les services")) > > (nl "Nieuwe deelopdracht @command{edit} voor diensten) > (body > ;; TODO: pas verwijzingen naar de handleiding aan wanneer ze vertaald is > (nl "Met de nieuwe bewerkingen @command{guix system edit} en > @command{guix home edit} kan je dienstsoorten van Guix System en Guix > Home bekijken en bewerken. Je kan bijvoorbeeld de definitie van de > systeemdienst OpenSSH als volgt openen: > > @example > guix system edit openssh > @end example. > > Voer @command{info \"(guix) Invoking guix system\"} of @command{info > \"(guix)Invoking guix home\"} uit voor meer informatie.") Thanks, I=E2=80=99ll add it before pushing! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 04 06:10:51 2022 Received: (at 55752-done) by debbugs.gnu.org; 4 Jun 2022 10:10:51 +0000 Received: from localhost ([127.0.0.1]:57678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nxQk7-0001VL-4K for submit@debbugs.gnu.org; Sat, 04 Jun 2022 06:10:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nxQk3-0001Uw-QG for 55752-done@debbugs.gnu.org; Sat, 04 Jun 2022 06:10:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47880) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nxQjp-00085m-27; Sat, 04 Jun 2022 06:10:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=F/g4ewqDGB+8hB6T+G9UA+rDBgRbudJDmFfmaynlPO8=; b=CBiXbQI0thIbqscMScAZ O3xfDxAEsiXm5ozLBkWpcI2rr3VIx8IvZgFrqslUOMdrYpZPir5Ul43zr89dYbk9HN0PU2U4lOf+o QtHSFuGxYLe9PzEyPIUFer6vMlMzR4aqhV+EDT6seJfxXzOeED5Fai/f88o3WdwKPmV+d2i8o64Ea yWhJzXSTBvgVCutk2vZR9rDozugvoSKLWNdIN7Yol9f9apffZscFM9o1OvYYGGZCW8pnsb2jG8tzw 8BAv0ijXe3v/V905Enx4ANmzlcyh2+BMYjJq5CNnT04PDO5gCHWmFHSN6Ur6bD7aPTA8UW3NtLe4F VvqzzlwJ6T5b6A==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:49202 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nxQjm-0003NK-IX; Sat, 04 Jun 2022 06:10:32 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maxime Devos Subject: Re: bug#55752: [PATCH 0/5] Add 'guix system edit' and 'guix home edit' References: <20220601154302.16222-1-ludo@gnu.org> <20220601154302.16222-5-ludo@gnu.org> <4a0e1ddf5755f8e612a7a16f3419838af7138edf.camel@telenet.be> Date: Sat, 04 Jun 2022 12:10:27 +0200 In-Reply-To: <4a0e1ddf5755f8e612a7a16f3419838af7138edf.camel@telenet.be> (Maxime Devos's message of "Thu, 02 Jun 2022 13:41:26 +0200") Message-ID: <87o7z8g2ng.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 55752-done Cc: 55752-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Pushed as ac826aef9c1527a9237ef31b7dadd814384e057b, thanks! From unknown Tue Aug 19 14:23:24 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 02 Jul 2022 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator