[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68935] [PATCH v3 7/7] import: Do not return package name with json
From: |
Herman Rimm |
Subject: |
[bug#68935] [PATCH v3 7/7] import: Do not return package name with json importer. |
Date: |
Tue, 20 Feb 2024 21:45:15 +0100 |
* 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
---
doc/package-hello.json | 6 +++---
guix/import/json.scm | 13 ++++++-------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/doc/package-hello.json b/doc/package-hello.json
index a47e266e4b..60193e97e6 100644
--- a/doc/package-hello.json
+++ b/doc/package-hello.json
@@ -6,7 +6,7 @@
"build-system": "gnu",
"arguments": {
"tests?": false
- }
+ },
"home-page": "https://www.gnu.org/software/hello/",
"synopsis": "Hello, GNU world: An example GNU package",
"description": "GNU Hello prints a greeting.",
@@ -16,11 +16,11 @@
{
"name": "greeter",
"version": "1.0",
- "source": "https://example.com/greeter-1.0.tar.gz",
+ "source": "mirror://gnu/hello/hello-2.10.tar.gz",
"build-system": "gnu",
"arguments": {
"test-target": "foo",
- "parallel-build?": false,
+ "parallel-build?": false
},
"home-page": "https://example.com/",
"synopsis": "Greeter using GNU Hello",
diff --git a/guix/import/json.scm b/guix/import/json.scm
index b87e9918c5..bf346a1bef 100644
--- a/guix/import/json.scm
+++ b/guix/import/json.scm
@@ -78,14 +78,13 @@ (define (json->code file-name)
#:result
(append result
(list
- (package->code (alist->package pkg
names))
- (string->symbol (assoc-ref pkg
"name"))))))))
- (list #:names '()
- #:result '())
- packages))))
+ (package->code
+ (alist->package pkg names))))))))
+ (list #:names '()
+ #:result '())
+ packages))))
(package
- (list (package->code (alist->package json))
- (string->symbol (assoc-ref json "name")))))))
+ (list (package->code (alist->package json)))))))
(const #f)))
(define (json->scheme-file file)
--
2.41.0
- [bug#68935] [PATCH v2 3/6] utils: Add insert-expression procedure., (continued)
- [bug#68935] [PATCH v3 0/7] Add insert option to guix import., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 1/7] doc: Note SVN dependency of texlive importer., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 7/7] import: Do not return package name with json importer.,
Herman Rimm <=
- [bug#68935] [PATCH v3 4/7] utils: Add find-definition-insertion-location procedure., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 3/7] utils: Add insert-expression procedure., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 6/7] import: Discard args after --version and --help., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 5/7] import: Insert packages into modules alphabetically., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 2/7] import: Wrap package expressions with define-public., Herman Rimm, 2024/02/20
- [bug#68935] [PATCH v3 0/7] Add insert option to guix import., Ludovic Courtès, 2024/02/23
- bug#68935: [PATCH v3 0/7] Add insert option to guix import., Ludovic Courtès, 2024/02/23