~ruther/guix-local

b386c11e7804e0b577411d930b60f1e0a4a0382c — Herman Rimm 2 years ago df3e44c
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>
2 files changed, 9 insertions(+), 10 deletions(-)

M doc/package-hello.json
M guix/import/json.scm
M doc/package-hello.json => doc/package-hello.json +3 -3
@@ 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",

M guix/import/json.scm => guix/import/json.scm +6 -7
@@ 78,14 78,13 @@ a list of S-expressions, or return #F when the JSON is invalid."
                              #: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)