From patchwork Wed Jan 8 18:56:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 19706 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 D242317A33; Wed, 8 Jan 2020 18:58:34 +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 8AA64179BD for ; Wed, 8 Jan 2020 18:58:34 +0000 (GMT) Received: from localhost ([::1]:48098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipGXK-0002kF-42 for patchwork@mira.cbaines.net; Wed, 08 Jan 2020 13:58:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50771) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipGVr-0000Jh-Sm for guix-patches@gnu.org; Wed, 08 Jan 2020 13:57:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipGVq-0002mW-Ld for guix-patches@gnu.org; Wed, 08 Jan 2020 13:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45339) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipGVq-0002mB-HU for guix-patches@gnu.org; Wed, 08 Jan 2020 13:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ipGVq-0006WI-Gw for guix-patches@gnu.org; Wed, 08 Jan 2020 13:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38678] [PATCH v2 3/4] refresh: Add '--load-path' option. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Jan 2020 18:57: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.157850980225016 (code B ref 38678); Wed, 08 Jan 2020 18:57:02 +0000 Received: (at 38678) by debbugs.gnu.org; 8 Jan 2020 18:56:42 +0000 Received: from localhost ([127.0.0.1]:51308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ipGVV-0006VO-UF for submit@debbugs.gnu.org; Wed, 08 Jan 2020 13:56:42 -0500 Received: from mail-wr1-f49.google.com ([209.85.221.49]:37118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ipGVT-0006Ud-1M for 38678@debbugs.gnu.org; Wed, 08 Jan 2020 13:56:40 -0500 Received: by mail-wr1-f49.google.com with SMTP id w15so4581443wru.4 for <38678@debbugs.gnu.org>; Wed, 08 Jan 2020 10:56:38 -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=uja9w2laBr0IKnfnjd4tuzewzh6Pcou0zYT8M882Sgc=; b=ujCs6NNdvo7pDuv0tkKxN64FZgNSXdSKh8HDXoLixIcXshLwtHsZyoeLT1xC9kPwZf EWdya9r0MlA0lbaoAq8vGVInZUr0IGzaiSK70KdK3rJX6dV/AO/lfkx1ITtt7lERCYoW lezbrGtQEFSkRf3r1Xeulu3RreuZM2Q5DP32a3Dj6RcZaauxqf7krQfMiasnJpP00r9a cfz7V0+sXaDS/wdU/Inf0GlB2kLPs1Ux5tH6P9BP2QBGklvch/Zqzh0Ji9IugP34CNG0 ba/UBu52HogJ5F0lsE06wG/2o+rFSD4OP7jL0KttQvErElIHUWFWJOZF+HDzl9JE29Ng 8kuw== 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=uja9w2laBr0IKnfnjd4tuzewzh6Pcou0zYT8M882Sgc=; b=V7q0RnQebKZk0G/xZEXdrpNgvCqFo4FxsA6RYYLhHRreaPd3vxIrCgG5P2Bc17Nj22 OZegwujPvBOKKdHpnC4WOS7Ko6XcVCseN64fukAiqhhQ3h8+KKMEvdSpk6w7G29oZ2uQ SSxbzPg9VpwMf44ht4SqlPwlxVTTqlbbxX1g0SzSEEr0DJ2n0YBZTzteyZKSdqtAqWz4 /QwZyS5ZmMCa5Qg+GEyTRrHzoB+eBHVELYkMqJGUCi3rXg0ZuYaVxn5F/t8+QY/GVFfl Qno6FL3l5aT3NwFW+ogxtfPp60IIaACTsO+YemVKj+b8If5ERBuddwih7yVs01lYxggP pXXQ== X-Gm-Message-State: APjAAAUJDYdRHNRLHomxhxqc3iD2LVwG51pNtc5iG84RiOr9m/RjQWaV Pkcrx3Z8oPhKau2hL6cH5lkJyIzc X-Google-Smtp-Source: APXvYqxVPtpxBeJfcUO8D/0OoFTh439zC/ol6LE4o6E/UGRutFpSVn5GYqYGz4P9CXFbGnqvN8gFCQ== X-Received: by 2002:a5d:4fd0:: with SMTP id h16mr5988573wrw.255.1578509793141; Wed, 08 Jan 2020 10:56:33 -0800 (PST) Received: from pfiuh02.univ-paris-diderot.fr ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id l19sm34889wmj.12.2020.01.08.10.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 10:56:32 -0800 (PST) From: zimoun Date: Wed, 8 Jan 2020 19:56:23 +0100 Message-Id: <20200108185624.8609-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200108185624.8609-1-zimon.toutoune@gmail.com> References: <20200108185624.8609-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/refresh.scm (%option): Add '--load-path' option. * doc/guix.texi: Document it. --- doc/guix.texi | 9 ++++++++- guix/scripts/refresh.scm | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3d26facd2e..bee4c3b2c9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -69,7 +69,7 @@ Copyright @copyright{} 2019 Jakob L. Kreuze@* Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019 Guillaume Le Vaillant@* -Copyright @copyright{} 2019 Simon Tournier@* +Copyright @copyright{} 2019, 2020 Simon Tournier@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -9552,6 +9552,13 @@ the user whether to download it or not. This is the default behavior. @item --key-server=@var{host} Use @var{host} as the OpenPGP key server when importing a public key. +@item --load-path=@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 tools. + @end table The @code{github} updater uses the diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index daf6fcf947..4695d0b517 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ #:use-module (guix ui) #:use-module (gcrypt hash) #:use-module (guix scripts) + #:use-module ((guix scripts build) #:select (%standard-build-options)) #:use-module (guix store) #:use-module (guix utils) #:use-module (guix packages) @@ -116,6 +118,19 @@ (leave (G_ "unsupported policy: ~a~%") arg))))) + ;; The short option -L is already used by --list-updaters, therefore + ;; it needs to be removed from %standard-build-options. + (let ((%load-path-option (find (lambda (option) + (member "load-path" + (option-names option))) + %standard-build-options))) + (option + (filter (lambda (name) (equal? "load-path" name)) + (option-names %load-path-option)) + (option-required-arg? %load-path-option) + (option-optional-arg? %load-path-option) + (option-processor %load-path-option))) + (option '(#\h "help") #f #f (lambda args (show-help) @@ -165,6 +180,9 @@ specified with `--select'.\n")) 'always', 'never', and 'interactive', which is also used when 'key-download' is not specified")) (newline) + (display (G_ " + --load-path=DIR prepend DIR to the package module search path")) + (newline) (display (G_ " -h, --help display this help and exit")) (display (G_ "