summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerman Rimm <herman@rimm.ee>2024-02-20 21:45:15 +0100
committerLudovic Courtès <ludo@gnu.org>2024-02-23 19:02:55 +0100
commitb386c11e7804e0b577411d930b60f1e0a4a0382c (patch)
treeb3eb20bbba353d0af5094b7f664a5eeecfadbd05
parentdf3e44cab1078ac6e84df9059a5acccdf9486700 (diff)
import: Do not return package name with json importer.
* guix/import/json.scm (json->code): Do not return package names after package expressions. * doc/package-hello.json: Fix comma errors and use valid greeter URL. Change-Id: Id71924e72f690a9bda5fbfdb65a443029adfd158 Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--doc/package-hello.json6
-rw-r--r--guix/import/json.scm13
2 files changed, 9 insertions, 10 deletions
diff --git a/doc/package-hello.json b/doc/package-hello.json
index a47e266e4bd..60193e97e61 100644
--- a/doc/package-hello.json
+++ b/doc/package-hello.json
@@ -6,7 +6,7 @@
6 "build-system": "gnu", 6 "build-system": "gnu",
7 "arguments": { 7 "arguments": {
8 "tests?": false 8 "tests?": false
9 } 9 },
10 "home-page": "https://www.gnu.org/software/hello/", 10 "home-page": "https://www.gnu.org/software/hello/",
11 "synopsis": "Hello, GNU world: An example GNU package", 11 "synopsis": "Hello, GNU world: An example GNU package",
12 "description": "GNU Hello prints a greeting.", 12 "description": "GNU Hello prints a greeting.",
@@ -16,11 +16,11 @@
16 { 16 {
17 "name": "greeter", 17 "name": "greeter",
18 "version": "1.0", 18 "version": "1.0",
19 "source": "https://example.com/greeter-1.0.tar.gz", 19 "source": "mirror://gnu/hello/hello-2.10.tar.gz",
20 "build-system": "gnu", 20 "build-system": "gnu",
21 "arguments": { 21 "arguments": {
22 "test-target": "foo", 22 "test-target": "foo",
23 "parallel-build?": false, 23 "parallel-build?": false
24 }, 24 },
25 "home-page": "https://example.com/", 25 "home-page": "https://example.com/",
26 "synopsis": "Greeter using GNU Hello", 26 "synopsis": "Greeter using GNU Hello",
diff --git a/guix/import/json.scm b/guix/import/json.scm
index b87e9918c5d..bf346a1bef0 100644
--- a/guix/import/json.scm
+++ b/guix/import/json.scm
@@ -78,14 +78,13 @@ a list of S-expressions, or return #F when the JSON is invalid."
78 #:result 78 #:result
79 (append result 79 (append result
80 (list 80 (list
81 (package->code (alist->package pkg names)) 81 (package->code
82 (string->symbol (assoc-ref pkg "name")))))))) 82 (alist->package pkg names))))))))
83 (list #:names '() 83 (list #:names '()
84 #:result '()) 84 #:result '())
85 packages)))) 85 packages))))
86 (package 86 (package
87 (list (package->code (alist->package json)) 87 (list (package->code (alist->package json)))))))
88 (string->symbol (assoc-ref json "name")))))))
89 (const #f))) 88 (const #f)))
90 89
91(define (json->scheme-file file) 90(define (json->scheme-file file)