From patchwork Tue Sep 28 22:06:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 33410 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 545F727BBE3; Tue, 28 Sep 2021 23:28:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D0D1C27BBE1 for ; Tue, 28 Sep 2021 23:28:27 +0100 (BST) Received: from localhost ([::1]:46580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVLaM-0002MS-W3 for patchwork@mira.cbaines.net; Tue, 28 Sep 2021 18:28:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVLZy-0002M5-RY for guix-patches@gnu.org; Tue, 28 Sep 2021 18:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35712) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVLZy-000704-Kb for guix-patches@gnu.org; Tue, 28 Sep 2021 18:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVLZy-0002DR-5I for guix-patches@gnu.org; Tue, 28 Sep 2021 18:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50879] [PATCH] scripts: home: Wire and document --expression flag. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Sep 2021 22:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50879@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16328680768499 (code B ref -1); Tue, 28 Sep 2021 22:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Sep 2021 22:27:56 +0000 Received: from localhost ([127.0.0.1]:47258 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVLZs-0002D0-0q for submit@debbugs.gnu.org; Tue, 28 Sep 2021 18:27:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:49988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVLZj-0002Cn-97 for submit@debbugs.gnu.org; Tue, 28 Sep 2021 18:27:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVLZi-0002Lq-8p for guix-patches@gnu.org; Tue, 28 Sep 2021 18:27:47 -0400 Received: from mout.gmx.net ([212.227.17.21]:35867) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVLZg-0006kC-1a for guix-patches@gnu.org; Tue, 28 Sep 2021 18:27:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1632868060; bh=c1Fk2dHs2ydD83uU1zp4OTPdEVSKDkqa+m8yZo35XKg=; h=X-UI-Sender-Class:From:To:Subject:Date; b=N5yY/RcxQdpbwoyhDcnf2v4fb8Oha4yq+GmnOzXXZHXDkzOBeRNRB/i/sFD+jpf7H oLWN5scSFMTacGBA1BCUmnWUwaJBjRlZFyZrSQhsHOT6yAItb/o0U33zar8fr+FBev XtEDddMf8HVCwCVDssQDTNxuvR0EjpxZ5B2lw4RE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MOiDX-1mBsTT1ie7-00QAq4 for ; Wed, 29 Sep 2021 00:27:40 +0200 User-agent: mu4e 1.6.6; emacs 27.2 From: Pierre Langlois Date: Tue, 28 Sep 2021 23:06:06 +0100 Message-ID: <87y27gl4is.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Q5ybabl3TmUEmwrwmXF4VhpblfGie284d6QkvSJhEEu+Q4USngQ 9P4TrISc7OGATesrkvw3G61sod3IpTuCAHjc0puP0S1pRY3H2mf+CYwZ0X+2AJiUWWeAAIY YI+KbSxz0kD+5f+10xWlsQtHHkxFXdfHgoSOcvtcYG2jOWKmuIi1rRU1nMeKO0bf1LMNzBa QlkTNLd0Pz3zsHxsmXQlw== X-UI-Out-Filterresults: notjunk:1;V03:K0:gMnLXGqBQ4A=:OVyq6hFA8g3xnzB84R2HIk tiKlnpUQCE83avf3xqyIatOzy1Q4Id5VbQumt7Uk0ncpHJ1UswA0qBcNnd/wMn0URkGeByjJZ Cg+CzoQkUSxyg0TPrtMrbrRxhHZjuVtL879R1IsluIVRogWxuS5D5N1CCXGm46GkU0MF7C1fM BhLqyztIlt9Q3uSs9+mPQJ59FrviYpTcxPfAc0xnIV+0RWR9EZYnjGgWIIEctliclVOUzM6i9 QylAJ0wRRqlfBe03R4Z0flKA9vYGhV1cewZF6CV4WQVgA2RcJ+QOrWcw6HjcAfnjEQsXa3x2s QKfisWGWENsHluTQjYCDyZ6lxFMzY81EzmLY7mn8KOXERpopOXAnroocYtgIw//TS7wmonVAv GjIjr+xX0QiNTZw8EQePFHi/KVb8SVM7sjufT8JtHef/V3VW2DPtwgfoHj5NFCayZYe6EaLTx sdXvBvLNQrtrboxDbxXfXLYyDkNmdvC71BPCkW4NKQk9xp1T00oJxYfybMlMVHWDp3fBQ1Se4 HAAvHI2/hGk2JNg5tHrAIKbnRfHt2GmMmTABs74P4zpfObQnsQJB3SRVr1oqYDKIRuXn8eE9l bF1yIuUdioDuLFzlMgLwts72R+J7vMdGqdREs3Ma/ZTwF4h7XKadVx17ZsBDoDcv8GNXFP0eT InXByWz/1VgaFE7g/lxvWEsTwianOg1RMk0IdGDTd/2/1jPcCZMKmT1U2AfpptRHhIhr85bt3 vElshKfHXF5lGrjra8neCgrYiePA34lxDbWwdQM+jHXy1Fyn3GvG7T4lyJsyXX+gkSCAvYZVS R7uWpb6CB6iAPA21F7wDIT+Fsc3OmFwEoqDfVxrRukwrvpBs/dKgVFRJqlUHBcwNsDaTogdiS hByGSCGMTDbdyCLt97yBfeal7d+TFjy+yZFC0degdMEcO1SVnBWEuLyT6Sjb0ZqcwzkXCyet/ GHkxsTuoK2yweCjl+yk3fhkZGxPGUoKXozwKc++BqMzGrhQMSaPixC3sTRs1eU6jk8oqC8NYh ui6KVothBG59Ayk8WRkmo84twC1KWaG0dcpC6baMFg7oTXudLIxJTUoagI2bJkzkIgZhkB8r2 oBavoDRpUyryO8= Received-SPF: pass client-ip=212.227.17.21; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Hi Guix! While testing out the new `guix home' command (congrats on merging it btw!), I noticed the --expression flag was supported but not exposed. So here's a patch :-). OK to commit? Thanks, Pierre From b40cab7892939f10cf366ee08b8a045a38e1fe78 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 28 Sep 2021 22:50:39 +0100 Subject: [PATCH] scripts: home: Wire and document --expression flag. * guix/scripts/home.scm (show-help): Add --expression option. (%options): Likewise. * doc/guix.texi (Invoking guix home): Document it. --- doc/guix.texi | 16 +++++++++++++++- guix/scripts/home.scm | 7 +++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3124ed2ef8..05d0d92b90 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -79,7 +79,7 @@ Copyright @copyright{} 2020 Jack Hill@* Copyright @copyright{} 2020 Naga Malleswari@* Copyright @copyright{} 2020, 2021 Brice Waegeneire@* Copyright @copyright{} 2020 R Veera Kumar@* -Copyright @copyright{} 2020 Pierre Langlois@* +Copyright @copyright{} 2020, 2021 Pierre Langlois@* Copyright @copyright{} 2020 pinoaffe@* Copyright @copyright{} 2020 André Batista@* Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@* @@ -36090,6 +36090,20 @@ $ guix home list-generations 10d @end table +@var{options} can contain any of the common build options (@pxref{Common +Build Options}). In addition, @var{options} can contain one of the +following: + +@table @option + +@item --expression=@var{expr} +@itemx -e @var{expr} +Consider the home-environment @var{expr} evaluates to. +This is an alternative to specifying a file which evaluates to a home +environment. + +@end table + @node Documentation @chapter Documentation diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index 75df6d707d..a466f3deb1 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Andrew Tropin ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,6 +87,9 @@ Some ACTIONS support additional ARGS.\n")) (show-build-options-help) (display (G_ " + -e, --expression=EXPR consider the home-environment EXPR evaluates to + instead of reading FILE, when applicable")) + (display (G_ " -v, --verbosity=LEVEL use the given verbosity LEVEL")) (newline) (display (G_ " @@ -115,6 +119,9 @@ Some ACTIONS support additional ARGS.\n")) (let ((level (string->number* arg))) (alist-cons 'verbosity level (alist-delete 'verbosity result))))) + (option '(#\e "expression") #t #f + (lambda (opt name arg result) + (alist-cons 'expression arg result))) %standard-build-options)) (define %default-options -- 2.33.0