scripts/build: options->things-to-build: Handle .json files.
* guix/scripts/build.scm (options->things-to-build): Handle files that end on .json.
This commit is contained in:
		
							parent
							
								
									16dd764691
								
							
						
					
					
						commit
						f87e563201
					
				
					 1 changed files with 6 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -2,6 +2,7 @@
 | 
			
		|||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 | 
			
		||||
;;; Copyright © 2013 Mark H Weaver <mhw@netris.org>
 | 
			
		||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
 | 
			
		||||
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
 | 
			
		||||
;;;
 | 
			
		||||
;;; This file is part of GNU Guix.
 | 
			
		||||
;;;
 | 
			
		||||
| 
						 | 
				
			
			@ -21,6 +22,7 @@
 | 
			
		|||
(define-module (guix scripts build)
 | 
			
		||||
  #:use-module (guix ui)
 | 
			
		||||
  #:use-module (guix scripts)
 | 
			
		||||
  #:use-module (guix import json)
 | 
			
		||||
  #:use-module (guix store)
 | 
			
		||||
  #:use-module (guix derivations)
 | 
			
		||||
  #:use-module (guix packages)
 | 
			
		||||
| 
						 | 
				
			
			@ -834,7 +836,10 @@ build---packages, gexps, derivations, and so on."
 | 
			
		|||
                       (else
 | 
			
		||||
                        (list (specification->package spec)))))
 | 
			
		||||
                (('file . file)
 | 
			
		||||
                 (ensure-list (load* file (make-user-module '()))))
 | 
			
		||||
                 (let ((file (or (and (string-suffix? ".json" file)
 | 
			
		||||
                                      (json->scheme-file file))
 | 
			
		||||
                                 file)))
 | 
			
		||||
                   (ensure-list (load* file (make-user-module '())))))
 | 
			
		||||
                (('manifest . manifest)
 | 
			
		||||
                 (map manifest-entry-item
 | 
			
		||||
                      (manifest-entries
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue