From patchwork Wed Jan 15 17:00:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 19831 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 E917217AC8; Wed, 15 Jan 2020 17:06:05 +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 A856917AC3 for ; Wed, 15 Jan 2020 17:06:05 +0000 (GMT) Received: from localhost ([::1]:57692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irm7I-00053a-WD for patchwork@mira.cbaines.net; Wed, 15 Jan 2020 12:06:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40744) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irm2X-0007l1-8w for guix-patches@gnu.org; Wed, 15 Jan 2020 12:01:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irm2R-0008MZ-W0 for guix-patches@gnu.org; Wed, 15 Jan 2020 12:01:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57713) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1irm2R-0008M6-Re for guix-patches@gnu.org; Wed, 15 Jan 2020 12:01:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1irm2R-0000HZ-QN for guix-patches@gnu.org; Wed, 15 Jan 2020 12:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38678] [PATCH v4 5/6] repl: Add '--load-path' option. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Jan 2020 17:01:03 +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.15791076341007 (code B ref 38678); Wed, 15 Jan 2020 17:01:03 +0000 Received: (at 38678) by debbugs.gnu.org; 15 Jan 2020 17:00:34 +0000 Received: from localhost ([127.0.0.1]:35447 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1irm1x-0000G5-TA for submit@debbugs.gnu.org; Wed, 15 Jan 2020 12:00:34 -0500 Received: from mail-wr1-f48.google.com ([209.85.221.48]:40233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1irm1j-0000El-53 for 38678@debbugs.gnu.org; Wed, 15 Jan 2020 12:00:24 -0500 Received: by mail-wr1-f48.google.com with SMTP id c14so16479973wrn.7 for <38678@debbugs.gnu.org>; Wed, 15 Jan 2020 09:00:19 -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=nZ67QpFig0c4Dpg0T+xnl+7pPIS6DVkM6+DNc/qAdjM=; b=NgQJEGrEqlK7Wqg5dd9zv8AFGH+mxcPhX7ZjHemZe5nDhr1UGqKEdWJvK1eZwBTP4N jmGimJLyC35L5vRC51zKmSbMUupH6/NywWgpEYbOWEzYujOOlZVT55AA9Ak5I3BfoB32 djCnxxePc++UwZJp+OJVH4vtC+lt0ICKcEYdRlxBjOIMZYD+xV08Pt0mHpJeDmP8Z1pW AfkQk1JOMM9tWF3T8luoNToYj6Zb3PpLU0gUCq2yVIigFcpY/+cnqfSJ4WYwseqkj3yi zGLvSnBCfH+8IaGBDlZwTkx8acXnFdBdUqYeN5GptIBJpCWbo6Mb6pckhtAZpjFnX95D Sv5w== 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=nZ67QpFig0c4Dpg0T+xnl+7pPIS6DVkM6+DNc/qAdjM=; b=dSskWNnqKVXhCBFK4tBt1g3O9OUBZOJ6tWtmxdgxRH8BfXgOpeVJHWfsAy3uB5lsy9 +tVjelhMtOeg5dB90b+Lo1NOB6TTHypchpRMteNYgt1MPGy+QerGZnK1gQSo3OCUi5zo 5tDZe49CiRlRTZRRqBfM7zmm3F6cJ1hRrvQgbd0l7bnCgdLPCFEwKhcTv0s1RaCvf1kb 24QI+5/rQSSYvMquBAgIAnSwXvpnDDk6G3ErWZQWCmhhMePRn6IA9lVxYskJvw+PZn7u UnN7+275Jol/xS7v8cMUb2TMT/LS0bDZS47uH/1yM5kQj8pFI5k4VyFe2jZWZ1z6e04Z XJBw== X-Gm-Message-State: APjAAAXYIDijk8llCe//Mn7SenuG/4O4OSOVBR4yxirYDY59jZts6LWL God7ONVaClk+aQpVaqzA/pks2aM7 X-Google-Smtp-Source: APXvYqyLn4brXxGYneVYQ7LB9QGy/qhmJqODZEuZUiXGCLFY/w9Qv39KpQdAs6YF6mGTqgLQ94idnw== X-Received: by 2002:adf:fe50:: with SMTP id m16mr31381516wrs.217.1579107613168; Wed, 15 Jan 2020 09:00:13 -0800 (PST) Received: from pfiuh02.univ-paris-diderot.fr ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id l3sm22907347wrt.29.2020.01.15.09.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 09:00:12 -0800 (PST) From: zimoun Date: Wed, 15 Jan 2020 18:00:05 +0100 Message-Id: <20200115170006.24892-5-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200115170006.24892-1-zimon.toutoune@gmail.com> References: <20200115170006.24892-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 (%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"))