me
/
guix
Archived
1
0
Fork 0
Code

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>
master
Herman Rimm 2024-02-20 21:45:15 +01:00 committed by Ludovic Courtès
parent df3e44cab1
commit b386c11e78
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/package-hello.json
View File

@ -6,7 +6,7 @@
"build-system": "gnu", "build-system": "gnu",
"arguments": { "arguments": {
"tests?": false "tests?": false
} },
"home-page": "https://www.gnu.org/software/hello/", "home-page": "https://www.gnu.org/software/hello/",
"synopsis": "Hello, GNU world: An example GNU package", "synopsis": "Hello, GNU world: An example GNU package",
"description": "GNU Hello prints a greeting.", "description": "GNU Hello prints a greeting.",
@ -16,11 +16,11 @@
{ {
"name": "greeter", "name": "greeter",
"version": "1.0", "version": "1.0",
"source": "https://example.com/greeter-1.0.tar.gz", "source": "mirror://gnu/hello/hello-2.10.tar.gz",
"build-system": "gnu", "build-system": "gnu",
"arguments": { "arguments": {
"test-target": "foo", "test-target": "foo",
"parallel-build?": false, "parallel-build?": false
}, },
"home-page": "https://example.com/", "home-page": "https://example.com/",
"synopsis": "Greeter using GNU Hello", "synopsis": "Greeter using GNU Hello",

13
guix/import/json.scm
View File

@ -78,14 +78,13 @@ a list of S-expressions, or return #F when the JSON is invalid."
#:result #:result
(append result (append result
(list (list
(package->code (alist->package pkg names)) (package->code
(string->symbol (assoc-ref pkg "name")))))))) (alist->package pkg names))))))))
(list #:names '() (list #:names '()
#:result '()) #:result '())
packages)))) packages))))
(package (package
(list (package->code (alist->package json)) (list (package->code (alist->package json)))))))
(string->symbol (assoc-ref json "name")))))))
(const #f))) (const #f)))
(define (json->scheme-file file) (define (json->scheme-file file)