diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-10-09 16:18:23 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-10-09 16:18:23 +0200 |
| commit | 4e45e352663f51d4b669256373819f8bc6fbd489 (patch) | |
| tree | c389ff86cf7789480aa3a48b47ef4130abf8f916 /guix | |
| parent | a22dc0c49aed0babe16ef92ae24847b343b7eb02 (diff) | |
| download | guix-patches-4e45e352663f51d4b669256373819f8bc6fbd489.tar guix-patches-4e45e352663f51d4b669256373819f8bc6fbd489.tar.gz | |
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.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/snix.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/guix/snix.scm b/guix/snix.scm index 04b5e7db2a..a77433bdc3 100644 --- a/guix/snix.scm +++ b/guix/snix.scm @@ -447,8 +447,15 @@ location of DERIVATION." (and=> (find-attribute-by-name "description" meta) attribute-value))) (description - ,(and=> (find-attribute-by-name "longDescription" meta) - attribute-value)) + ;; Likewise, prefer the official description of GNU packages. + ,(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) (compose license-variable attribute-value)))) loc)))))) |