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

snix: Prefer descriptions from the Womb rather than from Nixpkgs. 

* guix/snix.scm (snix-derivation->guix-package): Use
  'gnu-package-doc-description' as the description for GNU packages.
This commit is contained in:
Ludovic Courtès 2013-10-09 16:18:23 +02:00
parent a22dc0c49a
commit 4e45e35266
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
guix/snix.scm
View File

@ -447,8 +447,15 @@ location of DERIVATION."
(and=> (find-attribute-by-name "description" meta) (and=> (find-attribute-by-name "description" meta)
attribute-value))) attribute-value)))
(description (description
,(and=> (find-attribute-by-name "longDescription" meta) ;; Likewise, prefer the official description of GNU packages.
attribute-value)) ,(or (false-if-exception
(and=> (find (lambda (gnu-package)
(equal? (gnu-package-name gnu-package)
name))
(official-gnu-packages))
gnu-package-doc-description))
(and=> (find-attribute-by-name "longDescription" meta)
attribute-value)))
(license ,(and=> (find-attribute-by-name "license" meta) (license ,(and=> (find-attribute-by-name "license" meta)
(compose license-variable attribute-value)))) (compose license-variable attribute-value))))
loc)))))) loc))))))