nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ben Woodcroft 2016-01-17 09:12:14 +10:00
parent d0bd632f89
commit e88d5fa9eb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/import/gem.scm
View File

@ -77,7 +77,7 @@ the package."
(bytevector-u8-set! bv i (read-byte i)) (bytevector-u8-set! bv i (read-byte i))
(loop (1+ 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) dependencies licenses)
"Return the `package' s-expression for a Ruby package with the given NAME, "Return the `package' s-expression for a Ruby package with the given NAME,
VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES." VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."
@ -101,7 +101,7 @@ VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."
(,'unquote (,'unquote
,(string->symbol name)))) ,(string->symbol name))))
dependencies))))) dependencies)))))
(synopsis ,description) ; nothing better to use (synopsis ,synopsis)
(description ,description) (description ,description)
(home-page ,home-page) (home-page ,home-page)
(license ,(match licenses (license ,(match licenses
@ -117,6 +117,7 @@ VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."
(let ((name (assoc-ref package "name")) (let ((name (assoc-ref package "name"))
(version (assoc-ref package "version")) (version (assoc-ref package "version"))
(hash (assoc-ref package "sha")) (hash (assoc-ref package "sha"))
(synopsis (assoc-ref package "info")) ; nothing better to use
(description (beautify-description (description (beautify-description
(assoc-ref package "info"))) (assoc-ref package "info")))
(home-page (assoc-ref package "homepage_uri")) (home-page (assoc-ref package "homepage_uri"))
@ -129,5 +130,5 @@ VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES."
"runtime"))) "runtime")))
(licenses (map string->license (licenses (map string->license
(assoc-ref package "licenses")))) (assoc-ref package "licenses"))))
(make-gem-sexp name version hash home-page (make-gem-sexp name version hash home-page synopsis
description dependencies licenses))))) description dependencies licenses)))))

2
tests/gem.scm
View File

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