[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] scripts: package: Add --install-from-file option.
From: |
David Thompson |
Subject: |
[PATCH] scripts: package: Add --install-from-file option. |
Date: |
Sun, 09 Aug 2015 11:59:19 -0400 |
User-agent: |
Notmuch/0.19 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-unknown-linux-gnu) |
In my personal projects, I keep a 'package.scm' file in the root of the
source tree for use with 'guix environment -l'. However, it's also
handy to install that package by using 'guix package -e':
guix package -e '(primitive-load "package.scm")'
This patch adds a shorthand for this:
guix package -f package.scm
The motivation for this is to ultimately encourage other people to keep
a 'package.scm' file in their own repos for building reproducible
development environments and easily testing development snapshots, like
what we do with our 'guix-devel' package.
I'd like to add the same option for 'guix build', if this is approved.
>From 07c9b35facf810872f3bc8342e18b33033714adf Mon Sep 17 00:00:00 2001
From: David Thompson <address@hidden>
Date: Sun, 9 Aug 2015 11:35:51 -0400
Subject: [PATCH] scripts: package: Add --install-from-file option.
* guix/scripts/package.scm (show-help): Add help text for --install-from-file
option.
(%options): Add --install-from-file option.
* doc/guix.texi ("invoking guix package"): Document it.
---
doc/guix.texi | 31 +++++++++++++++++++++++++++++++
guix/scripts/package.scm | 10 ++++++++++
2 files changed, 41 insertions(+)
diff --git a/doc/guix.texi b/doc/guix.texi
index bcf07a6..dda478f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -1167,6 +1167,37 @@ Note that this option installs the first output of the
specified
package, which may be insufficient when needing a specific output of a
multiple-output package.
address@hidden address@hidden
address@hidden -f @var{file}
+Install the package that the code within @var{file} evaluates to.
+
+As an example, @var{file} might contain a definition like this
+(@pxref{Defining Packages}):
+
address@hidden
+(use-modules (guix packages)
+ (guix download)
+ (guix build-system gnu)
+ (guix licenses))
+
+(package
+ (name "hello")
+ (version "2.8")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/hello/hello-" version
+ ".tar.gz"))
+ (sha256
+ (base32 "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"))))
+ (build-system gnu-build-system)
+ (arguments `(#:configure-flags '("--enable-silent-rules")))
+ (inputs `(("gawk" ,gawk)))
+ (synopsis "Hello, GNU world: An example GNU package")
+ (description "Guess what GNU Hello prints!")
+ (home-page "http://www.gnu.org/software/hello/")
+ (license gpl3+))
address@hidden example
+
@item address@hidden @dots{}
@itemx -r @var{package} @dots{}
Remove the specified @var{package}s.
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index b545ea2..23f1597 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -381,6 +381,10 @@ Install, remove, or upgrade packages in a single
transaction.\n"))
-e, --install-from-expression=EXP
install the package EXP evaluates to"))
(display (_ "
+ -f, --install-from-file=FILE
+ install the package that the code within FILE
+ evaluates to"))
+ (display (_ "
-r, --remove PACKAGE ...
remove PACKAGEs"))
(display (_ "
@@ -454,6 +458,12 @@ Install, remove, or upgrade packages in a single
transaction.\n"))
(values (alist-cons 'install (read/eval-package-expression
arg)
result)
#f)))
+ (option '(#\f "install-from-file") #t #f
+ (lambda (opt name arg result arg-handler)
+ (values (alist-cons 'install
+ (load* arg (make-user-module '()))
+ result)
+ #f)))
(option '(#\r "remove") #f #t
(lambda (opt name arg result arg-handler)
(let arg-handler ((arg arg) (result result))
--
2.4.3
--
David Thompson
GPG Key: 0FF1D807