* More descriptions.

svn path=/nixpkgs/trunk/; revision=6709

17 files changed, 70 insertions, 5 deletions

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index d4abb46c3b7a..1abc4be3c603 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -11,4 +11,8 @@ stdenv.mkDerivation {
  
   inherit ncurses;
   buildInputs = [ncurses];
+
+  meta = {
+    description = "The most popular clone of the VI editor";
+  };
 }
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index 44476fca4ddf..1137a9d88385 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -7,4 +7,8 @@ stdenv.mkDerivation {
     md5 = "12e1faf49447c743c5c936636cd8a172";
   };
   buildInputs = [wxGTK chmlib];
+
+  meta = {
+    description = "A viewer for Microsoft HTML Help files";
+  };
 }
diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
index a63dd61b2434..45c18dba2770 100644
--- a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation {
   plugins = map (x: x + x.mozillaPlugin) plugins;
 
   meta = {
-    description = firefox.meta.description + " (with various plugins)";
+    description =
+      firefox.meta.description
+      + " (with plugins: "
+      + (let lib = import ../../../../lib;
+        in lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins)))
+      + ")";
   };
 }
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 7e0d66fcf825..4bd477043377 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -12,4 +12,8 @@ stdenv.mkDerivation {
   };
   configureFlags = (if sslSupport then "--with-ssl" else "");
   buildInputs = [ncurses (if sslSupport then openssl else null)];
+
+  meta = {
+    description = "A text-mode web browser";
+  };
 }
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 6239ed152711..4ab74b8227f2 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -27,4 +27,8 @@ stdenv.mkDerivation {
   NIX_LDFLAGS = "-ldvdcss";
 
   configureFlags = "--enable-alsa";
+
+  meta = {
+    description = "Cross-platform media player and streaming server";
+  };
 }
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 5795f98aa65f..e96252fc7386 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -11,4 +11,8 @@ stdenv.mkDerivation {
     (if xineLib.xineramaSupport then xineLib.libXinerama else null)
   ];
   configureFlags = "--without-readline --disable-xft";
+
+  meta = {
+    description = "Xlib-based interface to Xine, a video player";
+  };
 }
diff --git a/pkgs/development/compilers/abc/default.nix b/pkgs/development/compilers/abc/default.nix
index fbbf2479ea4d..1a71b808827e 100644
--- a/pkgs/development/compilers/abc/default.nix
+++ b/pkgs/development/compilers/abc/default.nix
@@ -12,6 +12,10 @@ let {
       };
 
       inherit apacheAnt polyglot soot javaCup xact jasmin jre javabdd paddle jedd patches;
+
+      meta = {
+        description = "The AspectBench Compiler for AspectJ";
+      };
     };
 
   soot =
diff --git a/pkgs/development/compilers/gcc-3.4/default.nix b/pkgs/development/compilers/gcc-3.4/default.nix
index 5bb97731c6c4..21ff1a0fc6f1 100644
--- a/pkgs/development/compilers/gcc-3.4/default.nix
+++ b/pkgs/development/compilers/gcc-3.4/default.nix
@@ -15,4 +15,10 @@ stdenv.mkDerivation {
   # !!! apply only if noSysDirs is set
   patches = [./no-sys-dirs.patch];
   inherit noSysDirs langC langCC langF77 profiledCompiler;
+
+  meta = {
+    homepage = "http://gcc.gnu.org/";
+    license = "GPL/LGPL";
+    description = "GNU Compiler Collection, 3.4.x";
+  };
 }
diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix
index dbfe5daaf636..b01cf247842a 100644
--- a/pkgs/development/compilers/gcc-4.1/default.nix
+++ b/pkgs/development/compilers/gcc-4.1/default.nix
@@ -16,4 +16,10 @@ stdenv.mkDerivation {
     [./pass-cxxcpp.patch]
     ++ (if noSysDirs then [./no-sys-dirs.patch] else []);
   inherit noSysDirs langC langCC langF77 profiledCompiler;
+
+  meta = {
+    homepage = "http://gcc.gnu.org/";
+    license = "GPL/LGPL";
+    description = "GNU Compiler Collection, 4.1.x";
+  };
 }
diff --git a/pkgs/development/compilers/gcc-apple/default.nix b/pkgs/development/compilers/gcc-apple/default.nix
index fa2f44c3bc9b..6044a93a70fa 100644
--- a/pkgs/development/compilers/gcc-apple/default.nix
+++ b/pkgs/development/compilers/gcc-apple/default.nix
@@ -4,6 +4,7 @@
 }:
 
 assert langC;
+assert stdenv.isDarwin;
 
 stdenv.mkDerivation {
   name = "gcc-4.0.1-apple-5341";
diff --git a/pkgs/development/compilers/ghc-wrapper/default.nix b/pkgs/development/compilers/ghc-wrapper/default.nix
index 2d4c5dd4634b..8c35db926b65 100644
--- a/pkgs/development/compilers/ghc-wrapper/default.nix
+++ b/pkgs/development/compilers/ghc-wrapper/default.nix
@@ -1,7 +1,7 @@
 {stdenv, ghc, libraries}:
 
 stdenv.mkDerivation {
-  name = ghc.name;
+  inherit (ghc) name meta;
   inherit ghc libraries;
   builder = ./builder.sh;
 }
diff --git a/pkgs/development/tools/misc/kcachegrind/default.nix b/pkgs/development/tools/misc/kcachegrind/default.nix
index 100d835a1788..171a6e60e30f 100644
--- a/pkgs/development/tools/misc/kcachegrind/default.nix
+++ b/pkgs/development/tools/misc/kcachegrind/default.nix
@@ -18,4 +18,8 @@ stdenv.mkDerivation {
     --x-libraries=${libX11}/lib";
     
   buildInputs = [kdelibs libX11 libXext libSM zlib perl qt expat libpng libjpeg];
+
+  meta = {
+    description = "Interactive visualisation tool for Valgrind profiling data";
+  };
 }
diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix
index 89a3e4c51bea..3df49cf50853 100644
--- a/pkgs/games/exult/default.nix
+++ b/pkgs/games/exult/default.nix
@@ -25,4 +25,8 @@ stdenv.mkDerivation {
       md5 = "cdae5956d7c52f35e90317913a660123";
     })
   ];    
+
+  meta = {
+    description = "A reimplementation of the Ultima VII game engine";
+  };
 }
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix
index 40241fb636c2..9168d0dc87fc 100644
--- a/pkgs/lib/default.nix
+++ b/pkgs/lib/default.nix
@@ -17,6 +17,15 @@ rec {
     fold (x: y: x + y) "";
 
 
+  # Place an element between each element of a list, e.g.,
+  # `intersperse "," ["a" "b" "c"]' returns ["a" "," "b" "," "c"].
+  intersperse = separator: list:
+    if list == [] || builtins.tail list == []
+    then list
+    else [(builtins.head list) separator]
+         ++ (intersperse separator (builtins.tail list));
+
+
   # Flatten the argument into a single list; that is, nested lists are
   # spliced into the top-level lists.  E.g., `flatten [1 [2 [3] 4] 5]
   # == [1 2 3 4 5]' and `flatten 1 == [1]'.
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index a4aa7abaab5b..f13d31673786 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -7,4 +7,8 @@ stdenv.mkDerivation {
     url = ftp://ftp.nluug.nl/pub/gnu/bash/bash-3.1.tar.gz;
     md5 = "ef5304c4b22aaa5088972c792ed45d72";
   };
+
+  meta = {
+    description = "GNU Bourne-Again Shell, the de facto standard shell on Linux";
+  };
 }
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 682b32b5acd4..55fb20534069 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -111,13 +111,14 @@ rec {
       builder = ./tools/bash;
       args = [ ./scripts/builder-stdenv-initial.sh ];
       inherit system staticTools;
-    }  // {
-      mkDerivation = attrs: derivation ((removeAttrs attrs ["meta"]) // {
+    } // {
+      # !!! too much duplication with stdenv/generic/default.nix
+      mkDerivation = attrs: (derivation ((removeAttrs attrs ["meta"]) // {
         builder = ./tools/bash;
         args = ["-e" attrs.builder];
         stdenv = body;
         system = body.system;
-      });
+      })) // { meta = if attrs ? meta then attrs.meta else {}; };
       shell = ./tools/bash;
     };
   };
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 9250ba672428..8e896aa4f330 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -35,6 +35,7 @@ let {
     ecj
     emacs
     enscript
+    exult
     file
     findutils
     firefoxWrapper