diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2020-04-14 18:02:26 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2020-04-16 23:41:52 +0200 |
| commit | 4f353c485dea4b549a0aabd1c87b0dd03fef4f1e (patch) | |
| tree | bec41230ac80575eae17bec41492a63cda4423c5 | |
| parent | f87e56320198fecd81ce588f571578b6cda5ed08 (diff) | |
| download | guix-4f353c485dea4b549a0aabd1c87b0dd03fef4f1e.tar.gz | |
scripts/package: Handle JSON files.
* guix/scripts/package.scm (%options): Support loading from JSON files when "install-from-file" is used.
| -rw-r--r-- | guix/scripts/package.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index badb1dcd38..40445832aa 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Benz Schenk <benz.schenk@uzh.ch> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ #:use-module (guix packages) #:use-module (guix profiles) #:use-module (guix search-paths) + #:use-module (guix import json) #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix config) @@ -418,7 +420,10 @@ Install, remove, or upgrade packages in a single transaction.\n")) (option '(#\f "install-from-file") #t #f (lambda (opt name arg result arg-handler) (values (alist-cons 'install - (load* arg (make-user-module '())) + (let ((file (or (and (string-suffix? ".json" arg) + (json->scheme-file arg)) + arg))) + (load* file (make-user-module '()))) result) #f))) (option '(#\r "remove") #f #t |