From patchwork Wed Jan 8 19:12: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: 19709 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 1CF9D17A33; Wed, 8 Jan 2020 19:13:18 +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 C3010179BD for ; Wed, 8 Jan 2020 19:13:17 +0000 (GMT) Received: from localhost ([::1]:48248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipGlZ-0008PY-Aa for patchwork@mira.cbaines.net; Wed, 08 Jan 2020 14:13:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38031) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipGlL-0008MH-TX for guix-patches@gnu.org; Wed, 08 Jan 2020 14:13:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipGlK-00048E-GX for guix-patches@gnu.org; Wed, 08 Jan 2020 14:13:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45365) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipGlK-000483-DN for guix-patches@gnu.org; Wed, 08 Jan 2020 14:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ipGlK-0006xl-A8 for guix-patches@gnu.org; Wed, 08 Jan 2020 14:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38678] [PATCH v3] refresh: 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: Wed, 08 Jan 2020 19:13: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.157851075226715 (code B ref 38678); Wed, 08 Jan 2020 19:13:02 +0000 Received: (at 38678) by debbugs.gnu.org; 8 Jan 2020 19:12:32 +0000 Received: from localhost ([127.0.0.1]:51337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ipGkq-0006wp-EP for submit@debbugs.gnu.org; Wed, 08 Jan 2020 14:12:32 -0500 Received: from mail-wr1-f43.google.com ([209.85.221.43]:45663) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ipGko-0006wV-FQ for 38678@debbugs.gnu.org; Wed, 08 Jan 2020 14:12:30 -0500 Received: by mail-wr1-f43.google.com with SMTP id j42so4542252wrj.12 for <38678@debbugs.gnu.org>; Wed, 08 Jan 2020 11:12:30 -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=TkCxHdIvP8Cdf6l8viebQ6jzn04XhgEqzH9lccQOD+Q=; b=eMZeqlD+exZvNUwKw94KPGZdytnF2SwHp68NfNZP/YLKqGbHcURs48NiueJS329lSm QN6W4vZEeUFJqz+cS1JvboXYhP+lPnbrKOTmMSkZ4dUlzRQSOlHk26lx8UPkkjdbtbIl NZaNIHn6Oegv0yN6MTpYXboC5yH/Bf/vfQl1bdcUStZwoPRUMRmjvqKIJb5EJe+WDUGb Mb6SwG+vgG4K+FRXFl7C7x4HizTG2wZZWRNaoStqrYaJinAScxDMmhX+Qa/u/4Pzb8LK dWG8Mlgbq0nCo5V0ydvATwtd35YYKs0jXNeloM+HUhgcwWqJYiCn73H75nMVNOjDUqhG X3zQ== 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=TkCxHdIvP8Cdf6l8viebQ6jzn04XhgEqzH9lccQOD+Q=; b=Md3PZDglWJ+99v/uGyIGSoqVfzevpIMV4ak/z7af4PrB8PrV4dSrqmwneB8fNgHCBZ 0UXB2U+vZdO6jZNC7+DEbykRb+rbjv+g80RKASJMxguTcPj0PqEFNxfeeEKLJR++tLp8 fhyfVs3HUhfwP/Ka8jL2rSygqjZeiOgD2f9VoDjrYKvRdO8bgwX3zVoFUxwrq5erYfeS NbEAQgT2HpNkw6XoIWg6iUFcY7SrwyCMRBCC0mIJWZK586uo5Low2o42+9EMdqX+qfeJ VH8LxTfaU3iUclz8IbM5pC8D4OxniqkhJA83pAUq4ZUjMs0QAxdTXsCtoRvaQ9n4eycU G2dw== X-Gm-Message-State: APjAAAWVEaxoLGxmIp9eQxBk3vMCgJLDb2Pq4Fhmp7TQ9cgKCCg9Ifib neQMYY7DNRvNm1QZ1393sONp9g4M X-Google-Smtp-Source: APXvYqwE+dpVByABhZy84urbp2QGCh4vXxoMk6EFFP3Hs8sP9lSxitZKwfUD2GGx11FEzy/u/5ZTbQ== X-Received: by 2002:adf:b64b:: with SMTP id i11mr5918954wre.58.1578510744394; Wed, 08 Jan 2020 11:12:24 -0800 (PST) Received: from pfiuh02.univ-paris-diderot.fr ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id n3sm4949262wrs.8.2020.01.08.11.12.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 11:12:23 -0800 (PST) From: zimoun Date: Wed, 8 Jan 2020 20:12:22 +0100 Message-Id: <20200108191222.9404-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/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..bc8e906054 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) (not (equal? #\L 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_ "