From patchwork Thu Jan 9 13:21:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 19712 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 B28AF17A56; Thu, 9 Jan 2020 13:22:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7327E17A4F for ; Thu, 9 Jan 2020 13:22:35 +0000 (GMT) Received: from localhost ([::1]:60318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipXli-0001yJ-U0 for patchwork@mira.cbaines.net; Thu, 09 Jan 2020 08:22:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52847) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipXlD-0001FR-BU for guix-patches@gnu.org; Thu, 09 Jan 2020 08:22:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipXlC-00067F-7q for guix-patches@gnu.org; Thu, 09 Jan 2020 08:22:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45968) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipXlC-000667-2K for guix-patches@gnu.org; Thu, 09 Jan 2020 08:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ipXlB-000509-S6 for guix-patches@gnu.org; Thu, 09 Jan 2020 08:22:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38678] [PATCH 1/2] repl: Add '--load-path' option. References: <20191219210958.8807-1-zimon.toutoune@gmail.com> In-Reply-To: <20191219210958.8807-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Jan 2020 13:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38678 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38678@debbugs.gnu.org Cc: zimoun Received: via spool by 38678-submit@debbugs.gnu.org id=B38678.157857609819176 (code B ref 38678); Thu, 09 Jan 2020 13:22:01 +0000 Received: (at 38678) by debbugs.gnu.org; 9 Jan 2020 13:21:38 +0000 Received: from localhost ([127.0.0.1]:51939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ipXkn-0004zB-Mf for submit@debbugs.gnu.org; Thu, 09 Jan 2020 08:21:37 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:35477) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ipXkl-0004yr-BQ for 38678@debbugs.gnu.org; Thu, 09 Jan 2020 08:21:35 -0500 Received: by mail-wm1-f66.google.com with SMTP id p17so2829588wmb.0 for <38678@debbugs.gnu.org>; Thu, 09 Jan 2020 05:21:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nZ67QpFig0c4Dpg0T+xnl+7pPIS6DVkM6+DNc/qAdjM=; b=AOi/uKh2fG5cA4oQ12pCKZxeDX8FRNzKQaMNYd47a97F0PTP4tiJSMHbGZXooIEDaW yNQEkI06JI1xz1I4ZsbVSvPVGmGcjfq59KmY5ieQgc9oRG4FPbMs9MT6hwTuN9JZ9v66 2lbUtzy/FRJYk5zb8sGIITavdIEwDkSp4XwCf+E5WHJylnQ2eaNfuDw27GgKMLmqO8/O huJIhHTrbtlxM974T3lBTPjiNL7sEK5i3QbS/SA98z4aBcQpgUNLOsD/fRqyn+rrT5D7 yZzPABa1HqrmUcqDYFFcQSICyTmdQ2QZuVbuIlLFMvwebacx5v5SObc569KP93tps9ck dANg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nZ67QpFig0c4Dpg0T+xnl+7pPIS6DVkM6+DNc/qAdjM=; b=lMBWTNl/eD1euDk0paBKP9jRyoiTP3EP9EuXbNISnFIohW/4F7WES9JmpiRQOI3dIS KcSUP2dze0LEYRyjcRHIBV3TgqXRPe2pDJM7Fs3ynlrGBRBgrIJyrvtC8eEfiQryBiHm lDr0iFlmy5oTiQeoF9/fCkiiQDfdOKjyWCfjdEjoqjvQ/WOB9QRBZ+9hkk7LqqFHFfg1 MX0hQJ1tEmPlHBZWIuUwpjWs7L9YYvniNtHIJaHwBPiE8QTAklM5vgcvdv22PT8UxEKJ HhPl34mHKK8kDFAfvHyc14ME1DITIaBmExek5ZlK+vMpILKxwmSpexzGeAZp1NXXmE57 ovoA== X-Gm-Message-State: APjAAAWRXrXLf3d9QB9XTSFIidfVtePyiISOsTA0Qe3uzm+s5d2j9Aud +/w5Y8vXbAD+C/lZfPTwsOEPCfwt X-Google-Smtp-Source: APXvYqxsP56+hmSq4bc6ykoTfmrCQ/Yr1/nmFkoMgrJHKrtLz8obWqDGwQ60WNKpfq9TOxOl7xrCLw== X-Received: by 2002:a05:600c:2c44:: with SMTP id r4mr4776770wmg.140.1578576089165; Thu, 09 Jan 2020 05:21:29 -0800 (PST) Received: from pfiuh02.univ-paris-diderot.fr ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id t81sm2895547wmg.6.2020.01.09.05.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 05:21:28 -0800 (PST) From: zimoun Date: Thu, 9 Jan 2020 14:21:22 +0100 Message-Id: <20200109132123.15718-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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/repl.scm (%option): Add '--load-path' option. * doc/guix.texi: Document it. --- doc/guix.texi | 8 ++++++++ guix/scripts/repl.scm | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 00eb85a4f7..ef6d1fc178 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7995,6 +7995,14 @@ Accept connections on localhost on port 37146. @item --listen=unix:/tmp/socket Accept connections on the Unix-domain socket @file{/tmp/socket}. @end table + +@item --load-path=@var{directory} +@itemx -L @var{directory} +Add @var{directory} to the front of the package module search path +(@pxref{Package Modules}). + +This allows users to define their own packages and make them visible to +the command-line tool. @end table @c ********************************************************************* diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index e1cc759fc8..39a9b09656 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019 Ludovic Courtès +;;; Copyright © 2020 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +20,7 @@ (define-module (guix scripts repl) #:use-module (guix ui) #:use-module (guix scripts) + #:use-module ((guix scripts build) #:select (%standard-build-options)) #:use-module (guix repl) #:use-module (guix utils) #:use-module (guix packages) @@ -52,7 +54,10 @@ (alist-cons 'type (string->symbol arg) result))) (option '("listen") #t #f (lambda (opt name arg result) - (alist-cons 'listen arg result))))) + (alist-cons 'listen arg result))) + (find (lambda (option) + (member "load-path" (option-names option))) + %standard-build-options))) (define (show-help) @@ -60,6 +65,8 @@ Start a Guile REPL in the Guix execution environment.\n")) (display (G_ " -t, --type=TYPE start a REPL of the given TYPE")) + (display (G_ " + -L, --load-path=DIR prepend DIR to the package module search path")) (newline) (display (G_ " -h, --help display this help and exit")) From patchwork Thu Jan 9 13:21:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 19711 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 29CAC17A56; Thu, 9 Jan 2020 13:22:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E1B8717A4F for ; Thu, 9 Jan 2020 13:22:13 +0000 (GMT) Received: from localhost ([::1]:60312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipXlN-0001Ky-56 for patchwork@mira.cbaines.net; Thu, 09 Jan 2020 08:22:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52972) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipXlE-0001HD-JU for guix-patches@gnu.org; Thu, 09 Jan 2020 08:22:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipXlD-0006D7-II for guix-patches@gnu.org; Thu, 09 Jan 2020 08:22:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45969) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipXlD-0006CJ-Cl for guix-patches@gnu.org; Thu, 09 Jan 2020 08:22:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ipXlC-00050H-8r for guix-patches@gnu.org; Thu, 09 Jan 2020 08:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38678] [PATCH 2/2] repl: Fix '--help' message. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Jan 2020 13:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38678 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38678@debbugs.gnu.org Cc: zimoun Received: via spool by 38678-submit@debbugs.gnu.org id=B38678.157857609819182 (code B ref 38678); Thu, 09 Jan 2020 13:22:02 +0000 Received: (at 38678) by debbugs.gnu.org; 9 Jan 2020 13:21:38 +0000 Received: from localhost ([127.0.0.1]:51941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ipXkn-0004zF-VD for submit@debbugs.gnu.org; Thu, 09 Jan 2020 08:21:38 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:39007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ipXkl-0004ys-Dx for 38678@debbugs.gnu.org; Thu, 09 Jan 2020 08:21:35 -0500 Received: by mail-wm1-f52.google.com with SMTP id 20so2802706wmj.4 for <38678@debbugs.gnu.org>; Thu, 09 Jan 2020 05:21:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PwHWMk1U27otBKx41y54hdQkBAqj44ipVOjoZtISmno=; b=inOBtRP7NWhcK/i/cXXsWYsed9hUUTQ6KH8t52mXEdpE3fLmJKoKZMhIWuZXQ72iMr lDOwfhMCLOpuNqvV6r+7laFmyGAQyTu8W6KWUqO53yiSLJAUSldD+lM1yofEN/zlw+Zm zEzE1kko9L4WJynQUDJvN/t1bLQ/Je/9cP02JcQ77fI5nZcUHv6UrABMwJ3IM80zs0eU OiXkozNXh9MC7fRT/G42zhErCjrnkSnSa4raA3uoIgsRmwi9A/64IgHScx3t7ONSh9jW fPuA/MSUFTKLEWhYl/m/k/ez7laFuNqmIFF0wZBrqmr0Ac+C7lwsbuo1vFHmOa4ZVP52 B+Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PwHWMk1U27otBKx41y54hdQkBAqj44ipVOjoZtISmno=; b=DpEBdlF7EwlAsv9VwukqiLjknlBV3tCeCUY1rGMysb2L/eOMkDVk35ON6p8+A/JaP1 BsJfM8EuwaY61fs2ge33vO5SlDf7D+YCMWH0cIBsuH3Qc0KU/LiYvLCopkd0BBQRYIyU Y9ys7GFhtL8Sk1zW93IlCNWjL+gT+MR7tcCz/N8uao2rbkN/bnQ9N+pJ8cMkwYHJm/Xk +Stbj2vKwtrp0LsWpyuTBzteueVxBQ7WNu1W/DVktDIXdy/OB6HvD2MI1vOdnDUxlJm/ SqsYuaIsojjDr4If+U09mkA3BZDGOu1eZrFNRJEw7LIjJB5Aih+qUxYa/yQxcu6tF6HY Ufpw== X-Gm-Message-State: APjAAAWu1kxkk73/6rIAGmTcbR9ut3fsJdI0VvGIBrOO/YcQDMyOKZPU 5ZSc6vtRsoIFI9v/32m2qtq9jWzW X-Google-Smtp-Source: APXvYqwZbtkriXeOrydJs3GjZUdoyl7cer+v/zzxDNmzweFt0thYLe4QVO/hqNE95dqAAI5IUOP51g== X-Received: by 2002:a7b:c956:: with SMTP id i22mr4887263wml.67.1578576089711; Thu, 09 Jan 2020 05:21:29 -0800 (PST) Received: from pfiuh02.univ-paris-diderot.fr ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id t81sm2895547wmg.6.2020.01.09.05.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 05:21:29 -0800 (PST) From: zimoun Date: Thu, 9 Jan 2020 14:21:23 +0100 Message-Id: <20200109132123.15718-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200109132123.15718-1-zimon.toutoune@gmail.com> References: <20200109132123.15718-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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/repl.scm: (show-help): Add '--listen' option message. --- guix/scripts/repl.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index 39a9b09656..fc3e4e2131 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -65,6 +65,9 @@ Start a Guile REPL in the Guix execution environment.\n")) (display (G_ " -t, --type=TYPE start a REPL of the given TYPE")) + (display (G_ " + --listen=ENDPOINT listen ENDPOINT instead of standard I/O")) + (newline) (display (G_ " -L, --load-path=DIR prepend DIR to the package module search path")) (newline)