[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/12: import/json: Add json->scheme-file.
From: |
guix-commits |
Subject: |
03/12: import/json: Add json->scheme-file. |
Date: |
Thu, 16 Apr 2020 17:43:19 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit 16dd764691d7f3ab954c82332f456bfa5f094514
Author: Ricardo Wurmus <address@hidden>
AuthorDate: Tue Apr 14 18:01:11 2020 +0200
import/json: Add json->scheme-file.
* guix/import/json.scm (json->code, json->scheme-file): New procedures.
---
guix/import/json.scm | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/guix/import/json.scm b/guix/import/json.scm
index 8900724..16dc2ad 100644
--- a/guix/import/json.scm
+++ b/guix/import/json.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2014 David Thompson <address@hidden>
;;; Copyright © 2015, 2016 Eric Bavier <address@hidden>
;;; Copyright © 2018, 2019 Ludovic Courtès <address@hidden>
+;;; Copyright © 2020 Ricardo Wurmus <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -22,8 +23,12 @@
#:use-module (json)
#:use-module (guix http-client)
#:use-module (guix import utils)
+ #:use-module (guix import print)
+ #:use-module (ice-9 rdelim)
+ #:use-module (srfi srfi-2)
#:use-module (srfi srfi-34)
- #:export (json-fetch))
+ #:export (json-fetch
+ json->scheme-file))
(define* (json-fetch url
;; Note: many websites returns 403 if we omit a
@@ -42,3 +47,31 @@ the query."
(result (json->scm port)))
(close-port port)
result)))
+
+(define (json->code file-name)
+ "Read FILE-NAME containing a JSON package definition and return an
+S-expression, or return #F when the JSON is invalid."
+ (catch 'json-invalid
+ (lambda ()
+ (let ((json (json-string->scm
+ (with-input-from-file file-name read-string))))
+ (package->code (alist->package json))))
+ (const #f)))
+
+(define (json->scheme-file file)
+ "Convert the FILE containing a JSON package definition to a Scheme
+representation and return the new file name (or #F on error)."
+ (and-let* ((json (json->code file))
+ (file* (let* ((tempdir (or (getenv "TMPDIR") "/tmp"))
+ (template (string-append tempdir "/guix-XXXXXX"))
+ (port (mkstemp! template)))
+ (close-port port)
+ template)))
+ (call-with-output-file file*
+ (lambda (port)
+ (write '(use-modules (gnu)
+ (guix)
+ ((guix licenses) #:prefix license:))
+ port)
+ (write json port)))
+ file*))
- branch master updated (7b2cb1b -> c9f321e), guix-commits, 2020/04/16
- 01/12: import/print: Return license with prefix., guix-commits, 2020/04/16
- 03/12: import/json: Add json->scheme-file.,
guix-commits <=
- 07/12: import/print: package->code: Wrap S-expression in definition., guix-commits, 2020/04/16
- 12/12: doc: Document building and installing from JSON files., guix-commits, 2020/04/16
- 05/12: scripts/package: Handle JSON files., guix-commits, 2020/04/16
- 10/12: import/utils: alist->package: Include arguments., guix-commits, 2020/04/16
- 02/12: import/print: package->code: Wrap build system value in module reference., guix-commits, 2020/04/16
- 09/12: import/json: json->code: Handle files with more than one definition., guix-commits, 2020/04/16
- 04/12: scripts/build: options->things-to-build: Handle .json files., guix-commits, 2020/04/16
- 06/12: import/json: Use json->code., guix-commits, 2020/04/16
- 11/12: import/print: Don't factorize URI if there's no version match., guix-commits, 2020/04/16
- 08/12: import/utils: alist->package: Ignore known inputs., guix-commits, 2020/04/16