diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-03-01 21:55:42 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-03-01 21:55:42 +0100 |
commit | eb0880e71d326753829a41b7afd66392960434cc (patch) | |
tree | 94fe7fc3f4773c23ae21032f15df9a0858b917ed /guix/scripts/package.scm | |
parent | 5d4b411f8a3372455a8c92d10a28e88e9edba6eb (diff) | |
download | guix-patches-eb0880e71d326753829a41b7afd66392960434cc.tar guix-patches-eb0880e71d326753829a41b7afd66392960434cc.tar.gz |
ui: Factorize `read/eval-package-expression'.
* guix/scripts/package.scm (read/eval-package-expression): Move to...
* guix/ui.scm (read/eval-package-expression): ... here.
* guix/scripts/build.scm (derivations-from-package-expressions): Use it.
Diffstat (limited to 'guix/scripts/package.scm')
-rw-r--r-- | guix/scripts/package.scm | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 28ef721603..ccca614d88 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -266,26 +266,6 @@ matching packages." (assoc-ref (derivation-outputs drv) sub-drv)))) `(,name ,out)))))) -(define (read/eval-package-expression str) - "Read and evaluate STR and return the package it refers to, or exit an -error." - (let ((exp (catch #t - (lambda () - (call-with-input-string str read)) - (lambda args - (leave (_ "failed to read expression ~s: ~s~%") - str args))))) - (let ((p (catch #t - (lambda () - (eval exp the-scm-module)) - (lambda args - (leave (_ "failed to evaluate expression `~a': ~s~%") - exp args))))) - (if (package? p) - p - (leave (_ "expression `~s' does not evaluate to a package~%") - exp))))) - ;;; ;;; Command-line options. |