* Added a bunch of descriptions.

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

22 files changed, 85 insertions, 1 deletions

diff --git a/pkgs/applications/audio/bmp/default.nix b/pkgs/applications/audio/bmp/default.nix
index b8a68ef1979..ea65d9d17e1 100644
--- a/pkgs/applications/audio/bmp/default.nix
+++ b/pkgs/applications/audio/bmp/default.nix
@@ -13,4 +13,8 @@ stdenv.mkDerivation {
     pkgconfig alsaLib esound libogg libvorbis id3lib
     glib gtk libglade
   ];
+
+  meta = {
+    description = "Beep Media Player, a XMMS fork";
+  };
 }
diff --git a/pkgs/applications/audio/xmms/default.nix b/pkgs/applications/audio/xmms/default.nix
index 269dd9804b4..bd5bb53414e 100644
--- a/pkgs/applications/audio/xmms/default.nix
+++ b/pkgs/applications/audio/xmms/default.nix
@@ -11,4 +11,8 @@ stdenv.mkDerivation {
   patches = [./alsa.patch];
 
   buildInputs = [alsaLib esound libogg libvorbis glib gtk];
+
+  meta = {
+    description = "A music player very similar to Winamp";
+  };
 }
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index f900d8dd9dc..a6f96eee4a9 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -21,4 +21,8 @@ stdenv.mkDerivation {
     (if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null)
     (if xpmSupport then libXpm else null)
   ];
+
+  meta = {
+    description = "All Hail Emacs, the ultimate editor";
+  };
 }
diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix
index 15a1d169fb6..62c9a732649 100644
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@@ -14,4 +14,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [pkgconfig gtk libpng];
+
+  meta = {
+    description = "A fast image viewer";
+  };
 }
diff --git a/pkgs/applications/misc/hello/ex-1/default.nix b/pkgs/applications/misc/hello/ex-1/default.nix
index bb88cf8a824..b35c8adc390 100644
--- a/pkgs/applications/misc/hello/ex-1/default.nix
+++ b/pkgs/applications/misc/hello/ex-1/default.nix
@@ -8,4 +8,8 @@ stdenv.mkDerivation {
     md5 = "70c9ccf9fac07f762c24f2df2290784d";
   };
   inherit perl;
+
+  meta = {
+    description = "GNU Hello, a classic computer science tool";
+  };
 }
diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix
index 81c03e965b4..768e19842c1 100644
--- a/pkgs/applications/networking/irc/chatzilla/default.nix
+++ b/pkgs/applications/networking/irc/chatzilla/default.nix
@@ -10,4 +10,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [unzip];
+
+  meta = {
+    description = "Stand-alone version of Chatzilla, an IRC client";
+  };
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index d0960a45211..6d16e5f31e2 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -41,4 +41,8 @@ stdenv.mkDerivation {
     "--enable-system-cairo"
   ]
   ++ (if enableOfficialBranding then ["--enable-official-branding"] else []);
+
+  meta = {
+    description = "Mozilla Thunderbird, a full-featured email client";
+  };
 }
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index befcab7a605..7ff4d149eb6 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -22,4 +22,8 @@ stdenv.mkDerivation {
   ];
 
   inherit spellChecking stdenv;
+
+  meta = {
+    description = "A GTK+-based Usenet newsreader good at both text and binaries";
+  };
 }
diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index 32e1955f097..6c8745800ab 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -7,4 +7,8 @@ stdenv.mkDerivation {
     md5 = "9a9a4f84ed5b6258f7ab321713adf20b";
   };
   buildInputs = [ghc zlib ncurses curl];
+
+  meta = {
+    description = "Patch-based version management system";
+  };
 }
diff --git a/pkgs/applications/version-management/subversion-1.4.x/default.nix b/pkgs/applications/version-management/subversion-1.4.x/default.nix
index e9a95f31cff..0c32a6cb256 100644
--- a/pkgs/applications/version-management/subversion-1.4.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.4.x/default.nix
@@ -42,4 +42,8 @@ stdenv.mkDerivation {
   ";
 
   inherit httpServer pythonBindings javahlBindings;
+
+  meta = {
+    description = "A version control system intended to be a compelling replacement for CVS in the open source community";
+  };
 }
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index e956548dcbd..06ec74feb53 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -45,4 +45,8 @@ stdenv.mkDerivation {
   # Xrandr.
   # See: http://itdp.de/~itdp/html/mplayer-dev-eng/2005-08/msg00427.html
   patches = [./mplayer-aspect.patch ./mplayer-pivot.patch];
+
+  meta = {
+    description = "A movie player that supports many video formats";
+  };
 }
diff --git a/pkgs/development/compilers/ghc/default.nix b/pkgs/development/compilers/ghc/default.nix
index 50e7cc57716..44a8dcbc03d 100644
--- a/pkgs/development/compilers/ghc/default.nix
+++ b/pkgs/development/compilers/ghc/default.nix
@@ -10,4 +10,8 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [readline ncurses];
   builder = ./builder.sh;
   inherit gcc;
+
+  meta = {
+    description = "The Glasgow Haskell Compiler";
+  };
 }
diff --git a/pkgs/development/interpreters/xulrunner/wrapper/default.nix b/pkgs/development/interpreters/xulrunner/wrapper/default.nix
index 658cd74cde1..e6d3b20ef9d 100644
--- a/pkgs/development/interpreters/xulrunner/wrapper/default.nix
+++ b/pkgs/development/interpreters/xulrunner/wrapper/default.nix
@@ -6,4 +6,6 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   inherit xulrunner launcher;
   appfile = application + /application.ini;
+
+  inherit (application) meta;
 }
diff --git a/pkgs/development/tools/misc/valgrind/default.nix b/pkgs/development/tools/misc/valgrind/default.nix
index 0c67e888bba..8046537e72a 100644
--- a/pkgs/development/tools/misc/valgrind/default.nix
+++ b/pkgs/development/tools/misc/valgrind/default.nix
@@ -6,4 +6,8 @@ stdenv.mkDerivation {
     url = http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2;
     md5 = "9407d33961186814cef0e6ecedfd6318";
   };
+
+  meta = {
+    description = "Award-winning suite of tools for debugging and profiling Linux programs";
+  };
 }
diff --git a/pkgs/development/tools/parsing/bison/bison-2.3.nix b/pkgs/development/tools/parsing/bison/bison-2.3.nix
index bc257fa3832..c732dd0afcf 100644
--- a/pkgs/development/tools/parsing/bison/bison-2.3.nix
+++ b/pkgs/development/tools/parsing/bison/bison-2.3.nix
@@ -9,6 +9,10 @@ stdenv.mkDerivation {
     md5 = "c18640c6ec31a169d351e3117ecce3ec";
   };
   buildInputs = [m4];
+
+  meta = {
+    description = "A yacc-compatible parser generator";
+  };
 } // {
   glrSupport = true;
 }
diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.33.nix b/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
index 74948bcf2c9..b6ba4b81c39 100644
--- a/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
+++ b/pkgs/development/tools/parsing/flex/flex-2.5.33.nix
@@ -13,4 +13,8 @@ stdenv.mkDerivation {
   };
   buildInputs = [yacc];
   propagatedBuildInputs = [m4];
+
+  meta = {
+    description = "A fast lexical analyser generator";
+  };
 }
diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix
index 315516f037f..a15efc77c2c 100644
--- a/pkgs/games/quake3/wrapper/default.nix
+++ b/pkgs/games/quake3/wrapper/default.nix
@@ -1,7 +1,12 @@
-{stdenv, fetchurl, game, paks, mesa, name}:
+{stdenv, fetchurl, game, paks, mesa, name, description}:
 
 stdenv.mkDerivation {
   builder = ./builder.sh;
   inherit game paks mesa name;
+  
   mesaSwitch = ../../../build-support/opengl/mesa-switch.sh;
+
+  meta = {
+    inherit description;
+  };
 }
diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix
index 8f91b7419eb..657f4e4fce0 100644
--- a/pkgs/misc/nix/default.nix
+++ b/pkgs/misc/nix/default.nix
@@ -17,4 +17,8 @@ stdenv.mkDerivation {
     --with-store-dir=${storeDir} --localstatedir=${stateDir}
     --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
     --disable-init-state";
+
+  meta = {
+    description = "The Nix Deployment System";
+  };
 }
diff --git a/pkgs/misc/tex/tetex/default.nix b/pkgs/misc/tex/tetex/default.nix
index bfd58cda8ba..82fb27c8369 100644
--- a/pkgs/misc/tex/tetex/default.nix
+++ b/pkgs/misc/tex/tetex/default.nix
@@ -19,4 +19,8 @@ stdenv.mkDerivation {
   patches = [./environment.patch];
 
   setupHook = ./setup-hook.sh;
+
+  meta = {
+    description = "A full-featured (La)TeX distribution";
+  };
 }
diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix
index a57ba3486cf..9ddc747648b 100644
--- a/pkgs/servers/http/apache-httpd/default.nix
+++ b/pkgs/servers/http/apache-httpd/default.nix
@@ -20,4 +20,8 @@ stdenv.mkDerivation {
   inherit perl expat zlib;
   openssl = if sslSupport then openssl else null;
   db4 = if db4Support then db4 else null;
+
+  meta = {
+    description = "Apache HTTPD, the world's most popular web server";
+  };
 }
diff --git a/pkgs/tools/networking/p2p/bittorrent/default.nix b/pkgs/tools/networking/p2p/bittorrent/default.nix
index f2ea431f11a..825f149d84a 100644
--- a/pkgs/tools/networking/p2p/bittorrent/default.nix
+++ b/pkgs/tools/networking/p2p/bittorrent/default.nix
@@ -9,4 +9,8 @@ stdenv.mkDerivation {
   };
   buildInputs = [python pygtk];
   inherit python pygtk makeWrapper;
+
+  meta = {
+    description = "The original client for the BitTorrent peer-to-peer file sharing protocol";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4e45aa62df..9c178400aea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2690,6 +2690,7 @@ rec {
 
   quake3demo = import ../games/quake3/wrapper {
     name = "quake3-demo";
+    description = "Demo of Quake 3 Arena, a classic first-person shooter";
     inherit fetchurl stdenv mesa;
     game = quake3game;
     paks = [quake3demodata];