guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/12: scripts/build: options->things-to-build: Handle .json files.


From: guix-commits
Subject: 04/12: scripts/build: options->things-to-build: Handle .json files.
Date: Thu, 16 Apr 2020 17:43:20 -0400 (EDT)

rekado pushed a commit to branch master
in repository guix.

commit f87e56320198fecd81ce588f571578b6cda5ed08
Author: Ricardo Wurmus <address@hidden>
AuthorDate: Tue Apr 14 18:01:49 2020 +0200

    scripts/build: options->things-to-build: Handle .json files.
    
    * guix/scripts/build.scm (options->things-to-build): Handle files that end 
on
    .json.
---
 guix/scripts/build.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 79bd84a..8ff2fd1 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic 
Courtès <address@hidden>
 ;;; Copyright © 2013 Mark H Weaver <address@hidden>
 ;;; Copyright © 2020 Marius Bakke <address@hidden>
+;;; Copyright © 2020 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]