~ruther/guix-local

e88d5fa9ebab07d0b23cb3fc0f3f38bd41047e94 — Ben Woodcroft 10 years ago d0bd632
import: gem: Beautify only the description, not the synopsis.

* guix/import/gem.scm (make-gem-sexp): Add synopsis argument.
(gem->guix-package): Pass unbeautified synopsis to make-gem-sexp.
* tests/gem.scm: Adapt it.
2 files changed, 5 insertions(+), 4 deletions(-)

M guix/import/gem.scm
M tests/gem.scm
M guix/import/gem.scm => guix/import/gem.scm +4 -3
@@ 77,7 77,7 @@ the package."
            (bytevector-u8-set! bv i (read-byte i))
            (loop (1+ i)))))))

(define (make-gem-sexp name version hash home-page description
(define (make-gem-sexp name version hash home-page synopsis description
                       dependencies licenses)
  "Return the `package' s-expression for a Ruby package with the given NAME,
VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."


@@ 101,7 101,7 @@ VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."
                         (,'unquote
                          ,(string->symbol name))))
                     dependencies)))))
     (synopsis ,description)    ; nothing better to use
     (synopsis ,synopsis)
     (description ,description)
     (home-page ,home-page)
     (license ,(match licenses


@@ 117,6 117,7 @@ VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."
         (let ((name         (assoc-ref package "name"))
               (version      (assoc-ref package "version"))
               (hash         (assoc-ref package "sha"))
               (synopsis     (assoc-ref package "info")) ; nothing better to use
               (description  (beautify-description
                              (assoc-ref package "info")))
               (home-page    (assoc-ref package "homepage_uri"))


@@ 129,5 130,5 @@ VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."
                                              "runtime")))
               (licenses     (map string->license
                                  (assoc-ref package "licenses"))))
           (make-gem-sexp name version hash home-page
           (make-gem-sexp name version hash home-page synopsis
                          description dependencies licenses)))))

M tests/gem.scm => tests/gem.scm +1 -1
@@ 69,7 69,7 @@
           (("bundler" ('unquote 'bundler))
            ("ruby-bar" ('unquote 'ruby-bar)))))
         ('synopsis "A cool gem")
         ('description "A cool gem")
         ('description "This package provides a cool gem")
         ('home-page "https://example.com")
         ('license ('list 'expat 'asl2.0)))
       #t)