From patchwork Wed Jan 8 18:56: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: 19707 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 5B7E017A33; Wed, 8 Jan 2020 18:58:42 +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 1D349179BD for ; Wed, 8 Jan 2020 18:58:42 +0000 (GMT) Received: from localhost ([::1]:48100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipGXR-0002r7-K9 for patchwork@mira.cbaines.net; Wed, 08 Jan 2020 13:58:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50754) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipGVr-0000Ii-DT for guix-patches@gnu.org; Wed, 08 Jan 2020 13:57:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipGVq-0002ln-8Q for guix-patches@gnu.org; Wed, 08 Jan 2020 13:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45338) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ipGVq-0002lV-4e 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-0006WA-4R for guix-patches@gnu.org; Wed, 08 Jan 2020 13:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38678] [PATCH v2 2/4] size: 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.157850980024996 (code B ref 38678); Wed, 08 Jan 2020 18:57:02 +0000 Received: (at 38678) by debbugs.gnu.org; 8 Jan 2020 18:56:40 +0000 Received: from localhost ([127.0.0.1]:51305 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ipGVT-0006V5-E2 for submit@debbugs.gnu.org; Wed, 08 Jan 2020 13:56:39 -0500 Received: from mail-wr1-f50.google.com ([209.85.221.50]:33528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ipGVS-0006Uc-In for 38678@debbugs.gnu.org; Wed, 08 Jan 2020 13:56:38 -0500 Received: by mail-wr1-f50.google.com with SMTP id b6so4625945wrq.0 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=PPdowZ0nhM9sXqL43oPz2SLA3j3R6zawY+8NkpN+6Dc=; b=HF+zAfhzSFoF3e2LPyDRt8JcXACS3345aQg/uZy3DOxoe5PSAO7UjlaJrmtettiPFj TfyMmgBVOYTuWdshkeRW1HFEaB/pG8XCyCZPDiCOGI5HMObthlxxx2lMFQGesagAIarp OAqbVBuIndLrZIqO6ozM6qZLv3zDYCVSxISIn8WnON4ca+0gggULpfxo5+7LcW7DLA6t 9jo/shmTzlm069rLPbgW1xOKDhfJr9evJnyhF1Armwc5n6llKvLf3Ip7Nk4TCTJCm7xC 822XjYGZBb1hSS9qc3QX90UbLqZhs9RMQh3xdXWsvsCnaWrhr4RZFk34eBFRQjLZbCLi gfVw== 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=PPdowZ0nhM9sXqL43oPz2SLA3j3R6zawY+8NkpN+6Dc=; b=Z/z2CwzEAzGM5JsdbhDWP8FLYXAyTuD9KCNwDjLzb7MNAeSZfVNaYWX8WRyjahz+Ej o3OPJp+np3ZbQsUgzjxEOzfqlg7pdx1oWg1ZOJVHjvClHWoP1LOp9TkXfXMxXz7AUMqD YdJgMhkThvUyjqEdaWPwIoQ3uyD1YhivabuiXc/shM4qWw9TA8i4pfhhViUw3hxGlZBS 80dTK2ic9Dcyrrk31PD8MQxVmjPzCxgXKUcUwh6gptU64+5eMt9uJsJ1wto3UPihAKy4 7nNjAAJH3ExMmp6GWoYkMsCt5uKsBXFHjO6upCu9DK8ilnj77aPb1GIhzAmdcIG7l5gs HLSg== X-Gm-Message-State: APjAAAWDt2s5dzY7bBc4XmHUtXUM3fFiTliuhe2FF45EFkgPVz/vF5P9 cj7qqkYkS6EEYQ27QTFZ29jxLVHm X-Google-Smtp-Source: APXvYqyGdf5A05QV2+6yRdn59+EKoPFcipi3XHJeHEUYe/YnZigBA946wqz6V8MLZVLB+P0BAFO8uA== X-Received: by 2002:a5d:4752:: with SMTP id o18mr6087503wrs.330.1578509792581; Wed, 08 Jan 2020 10:56:32 -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.31 (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:22 +0100 Message-Id: <20200108185624.8609-2-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/size.scm (%option): Add '--load-path' option. * doc/guix.texi: Document it. --- doc/guix.texi | 7 +++++++ guix/scripts/size.scm | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 37218eb847..3d26facd2e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9837,6 +9837,13 @@ the case, @command{guix size} fails as it tries to load it. @itemx -s @var{system} Consider packages for @var{system}---e.g., @code{x86_64-linux}. +@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 tools. @end table @node Invoking guix graph diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm index f549ce05b8..2446b84587 100644 --- a/guix/scripts/size.scm +++ b/guix/scripts/size.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2019 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +20,7 @@ (define-module (guix scripts size) #:use-module (guix ui) #:use-module (guix scripts) + #:use-module (guix scripts build) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix combinators) @@ -242,6 +244,9 @@ Report the size of PACKAGE and its dependencies.\n")) -m, --map-file=FILE write to FILE a graphical map of disk usage")) (newline) (display (G_ " + -L, --load-path=DIR prepend DIR to the package module search path")) + (newline) + (display (G_ " -h, --help display this help and exit")) (display (G_ " -V, --version display version information and exit")) @@ -273,6 +278,9 @@ Report the size of PACKAGE and its dependencies.\n")) (option '(#\m "map-file") #t #f (lambda (opt name arg result) (alist-cons 'map-file arg result))) + (find (lambda (option) + (member "load-path" (option-names option))) + %standard-build-options) (option '(#\h "help") #f #f (lambda args (show-help)