[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: show, search: Add '--load-path'.
From: |
guix-commits |
Subject: |
01/07: show, search: Add '--load-path'. |
Date: |
Mon, 23 Sep 2019 17:41:42 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 4f8c29a75c3647b104c43ebf615d4a63a5e056b3
Author: Ludovic Courtès <address@hidden>
Date: Mon Sep 23 21:22:28 2019 +0200
show, search: Add '--load-path'.
* guix/scripts/search.scm (show-help, %options): Add -L/--load-path.
* guix/scripts/show.scm (show-help, %options): Add -L/--load-path.
---
guix/scripts/search.scm | 11 ++++++++++-
guix/scripts/show.scm | 11 ++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/search.scm b/guix/scripts/search.scm
index 8fceb83..827b2eb 100644
--- a/guix/scripts/search.scm
+++ b/guix/scripts/search.scm
@@ -19,6 +19,8 @@
(define-module (guix scripts search)
#:use-module (guix ui)
#:use-module (guix scripts package)
+ #:use-module ((guix scripts build)
+ #:select (%standard-build-options))
#:use-module (guix scripts)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
@@ -36,6 +38,9 @@ This is an alias for 'guix package -s'.\n"))
(display (G_ "
-V, --version display version information and exit"))
(newline)
+ (display (G_ "
+ -L, --load-path=DIR prepend DIR to the package module search path"))
+ (newline)
(show-bug-report-information))
(define %options
@@ -46,7 +51,11 @@ This is an alias for 'guix package -s'.\n"))
(exit 0)))
(option '(#\V "version") #f #f
(lambda args
- (show-version-and-exit "guix search")))))
+ (show-version-and-exit "guix search")))
+
+ (find (lambda (option)
+ (member "load-path" (option-names option)))
+ %standard-build-options)))
(define (guix-search . args)
(define (handle-argument arg result)
diff --git a/guix/scripts/show.scm b/guix/scripts/show.scm
index 94f0559..ef64b57 100644
--- a/guix/scripts/show.scm
+++ b/guix/scripts/show.scm
@@ -19,6 +19,8 @@
(define-module (guix scripts show)
#:use-module (guix ui)
#:use-module (guix scripts package)
+ #:use-module ((guix scripts build)
+ #:select (%standard-build-options))
#:use-module (guix scripts)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
@@ -36,6 +38,9 @@ This is an alias for 'guix package --show='.\n"))
(display (G_ "
-V, --version display version information and exit"))
(newline)
+ (display (G_ "
+ -L, --load-path=DIR prepend DIR to the package module search path"))
+ (newline)
(show-bug-report-information))
(define %options
@@ -46,7 +51,11 @@ This is an alias for 'guix package --show='.\n"))
(exit 0)))
(option '(#\V "version") #f #f
(lambda args
- (show-version-and-exit "guix show")))))
+ (show-version-and-exit "guix show")))
+
+ (find (lambda (option)
+ (member "load-path" (option-names option)))
+ %standard-build-options)))
(define (guix-show . args)
(define (handle-argument arg result)
- branch master updated (a2f6f3b -> 7b3f56f), guix-commits, 2019/09/23
- 02/07: repl, marionette: 'self-quoting?' matches keywords., guix-commits, 2019/09/23
- 03/07: gexp: Catch and report non-self-quoting gexp inputs., guix-commits, 2019/09/23
- 06/07: gnu: cuirass: Update to d27ff21., guix-commits, 2019/09/23
- 04/07: gexp: Remove unused procedure., guix-commits, 2019/09/23
- 05/07: services: cuirass: Remove unneeded conditional., guix-commits, 2019/09/23
- 07/07: pull: Use ~/.cache/guix/checkouts instead of ~/.cache/guix/pull., guix-commits, 2019/09/23
- 01/07: show, search: Add '--load-path'.,
guix-commits <=