about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/applications/graphics/dia/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/pidgin/default.nix4
-rw-r--r--pkgs/development/libraries/mesa/default.nix1
-rw-r--r--pkgs/development/tools/misc/lsof/default.nix5
-rw-r--r--pkgs/misc/synaptics/default.nix4
-rw-r--r--pkgs/servers/x11/xorg/default.nix4
-rw-r--r--pkgs/tools/misc/units/default.nix4
-rw-r--r--pkgs/tools/networking/p2p/bit-tornado/default.nix4
-rw-r--r--pkgs/tools/networking/wget/default.nix4
9 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 7d1a7df9e43c7..5e66cd40a298e 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -8,4 +8,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [gtk glib perl pkgconfig perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl];
+
+  meta = {
+    description = "Gnome Diagram drawing software.";
+  };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 82aa3f0dee6f4..21885b6bcd48b 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -31,4 +31,8 @@ stdenv.mkDerivation {
     perl perlXMLParser libxml2 openssl nss
     libXScrnSaver
   ];
+
+  meta = {
+    description = "Pidgin IM - XMPP(Jabber), AIM/ICQ, IRC, SIP etc client.";
+  };
 }
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 89fec37120739..9ee247afa3b80 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -28,4 +28,5 @@ stdenv.mkDerivation {
       md5 = "1a8c4d4fc699233f5fdb902b8753099e";
     }) */
   buildInputs = [pkgconfig x11 libXmu libXi makedepend libdrm glproto libXxf86vm];
+  meta = {description = "OpenGL-compatible 3D library. Supports acceleration.";};
 }
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index a24bb17b52858..4aa5011783744 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -12,4 +12,9 @@ stdenv.mkDerivation {
   preBuild = "sed -i Makefile -e 's/^CFGF=/&	-DHASIPv6=1/;';";
   configurePhase = "./Configure -n linux;";
   installPhase = " mkdir -p $out/bin $out/man/man8; cp lsof.8 $out/man/man8/; cp lsof $out/bin";
+
+  meta = {
+    description = "List open files. Can show what process has opened some file, 
+socket (IPv6/IPv4/UNIX local), or partition (by opening a file from it).";
+  };
 }
diff --git a/pkgs/misc/synaptics/default.nix b/pkgs/misc/synaptics/default.nix
index c2e2795114c8e..d4acd9e5f3709 100644
--- a/pkgs/misc/synaptics/default.nix
+++ b/pkgs/misc/synaptics/default.nix
@@ -9,4 +9,8 @@ stdenv.mkDerivation {
 
   makeFlags="DESTDIR=$out PREFIX=/";
   buildInputs = [libX11 pkgconfig xorgserver libXi libXext];
+
+  meta = {
+    description = "Driver for synaptics touchpad.";
+  };
 }
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 629e2aea77286..4ab51d72ba6a6 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2414,6 +2414,9 @@ rec {
       sha256 = "0h0pa3ynvqqikkvrx7jhgdjg207njbph408k1i6azqscpmwz5g39";
     };
     buildInputs = [pkgconfig libFS libXfont xtrans ];
+    meta = {
+	description = "X font server. Fontpath for it is unix/:7100. ";
+    };
   }) // {inherit libFS libXfont xtrans ;};
     
   xfsinfo = (stdenv.mkDerivation {
@@ -2464,6 +2467,7 @@ rec {
       sha256 = "1n365k4704wnnscl5l00mkq1qc7a79pi0b2cxh3yiidha87s2s5r";
     };
     buildInputs = [pkgconfig libX11 libXau libXmu ];
+    meta = {description = "X per-host access management tool.";};
   }) // {inherit libX11 libXau libXmu ;};
     
   xineramaproto = (stdenv.mkDerivation {
diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index 7121c1b406642..a056ec13f0277 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -6,4 +6,8 @@ stdenv.mkDerivation {
     url = ftp://ftp.gnu.org/gnu/units/units-1.86.tar.gz;
     sha256 = "1syc4d3x1wb03hcxnz7rkgapk96biazfk2qqn2wfyx54bq829lhi";
   };
+
+  meta = {
+    description = "Unit conversion tool.";
+  };
 }
diff --git a/pkgs/tools/networking/p2p/bit-tornado/default.nix b/pkgs/tools/networking/p2p/bit-tornado/default.nix
index 222ca4530688e..75e06f7ca2f82 100644
--- a/pkgs/tools/networking/p2p/bit-tornado/default.nix
+++ b/pkgs/tools/networking/p2p/bit-tornado/default.nix
@@ -16,4 +16,8 @@ stdenv.mkDerivation {
 	wxPython26+"/lib/python2.4/site-packages/wx-2.6-gtk2-unicode; "+
 	"python `which btdownloadgui.py` --ipv6_enabled 1 --ipv6_binds_v4 0 \"$@\";' >"+
 	"$out/bin/bittornado ; chmod a+rx $out/bin/bittornado;";
+
+  meta = {
+    description = "Bittorrent client with IPv6 support.";
+  };
 }
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 34094faab9147..e2599c76962fe 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -8,4 +8,8 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [gettext];
+
+  meta = {
+		description = "A console downloading program. Has some features for mirroring sites.";
+	};
 }