diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-04-26 16:43:08 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-04-26 16:43:08 +0200 |
commit | a9db7d10b6e4e86fb2b87a4161db3b1f202002fd (patch) | |
tree | 4a22481ab65447d8bc1cc307a76a884a7e7bbee9 /guix/snix.scm | |
parent | e33d9d6f09874f83bb5a03f49cb969a84588e10e (diff) | |
parent | 2b6bdf7eb3c95716ac107ea6caea2e0b7077ae77 (diff) | |
download | guix-patches-a9db7d10b6e4e86fb2b87a4161db3b1f202002fd.tar guix-patches-a9db7d10b6e4e86fb2b87a4161db3b1f202002fd.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
Makefile.am
gnu/packages/autotools.scm
gnu/packages/guile.scm
gnu/packages/python.scm
gnu/packages/shishi.scm
guix/gnu-maintenance.scm
guix/scripts/build.scm
guix/scripts/gc.scm
guix/scripts/package.scm
guix/scripts/substitute-binary.scm
guix/ui.scm
nix/nix-daemon/guix-daemon.cc
test-env.in
tests/nar.scm
tests/store.scm
Diffstat (limited to 'guix/snix.scm')
-rw-r--r-- | guix/snix.scm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/guix/snix.scm b/guix/snix.scm index 0c19fecb28..04b5e7db2a 100644 --- a/guix/snix.scm +++ b/guix/snix.scm @@ -34,6 +34,7 @@ #:use-module (guix utils) #:use-module (guix base32) #:use-module (guix config) + #:use-module (guix gnu-maintenance) #:export (open-nixpkgs xml->snix nixpkgs->guix-package)) @@ -435,8 +436,16 @@ location of DERIVATION." (home-page ,(and=> (find-attribute-by-name "homepage" meta) attribute-value)) - (synopsis ,(and=> (find-attribute-by-name "description" meta) - attribute-value)) + (synopsis + ;; For GNU packages, prefer the official synopsis. + ,(or (false-if-exception + (and=> (find (lambda (gnu-package) + (equal? (gnu-package-name gnu-package) + name)) + (official-gnu-packages)) + gnu-package-doc-summary)) + (and=> (find-attribute-by-name "description" meta) + attribute-value))) (description ,(and=> (find-attribute-by-name "longDescription" meta) attribute-value)) |