rekahsoft
/
guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scripts/package: Handle JSON files. 

* guix/scripts/package.scm (%options): Support loading from JSON files when
"install-from-file" is used.
This commit is contained in:
Ricardo Wurmus 2020-04-14 18:02:26 +02:00
parent f87e563201
commit 4f353c485d
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/scripts/package.scm
View File

@ -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