* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14557

11 files changed, 26 insertions, 38 deletions

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index c909cebb4b0..8adc7fb634b 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.15";
+  name = "man-pages-3.18";
   
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.bz2";
-    sha256 = "0pr29ziz2d2zl2iii16372x2bqvx1a5g8xbb6wga4nxiz4w6ixhh";
+    sha256 = "7be08777fae2c873106f6d3ae09678444e635112ad9c52f9e9200439710dd8de";
   };
 
   preBuild = "
diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix
index 2775a36f321..8053020a3f2 100644
--- a/pkgs/data/documentation/rnrs/common.nix
+++ b/pkgs/data/documentation/rnrs/common.nix
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
   builder = ./builder.sh;
 
   meta = {
-    description = ''Revised^${toString revision} Report on the
-                    Algorithmic Language Scheme'';
+    description = "Revised^${toString revision} Report on the Algorithmic Language Scheme";
 
     longDescription = ''
       This package contains the GNU Info version of the
diff --git a/pkgs/data/fonts/clearlyU/1.9.nix b/pkgs/data/fonts/clearlyU/1.9.nix
index db5709bf035..3ff5db2c60c 100644
--- a/pkgs/data/fonts/clearlyU/1.9.nix
+++ b/pkgs/data/fonts/clearlyU/1.9.nix
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		A Unicode font.
-";
+		description = "A Unicode font";
 		inherit src;
 	};
 }
diff --git a/pkgs/data/fonts/junicode/0.6.15.nix b/pkgs/data/fonts/junicode/0.6.15.nix
index 601b6671e95..b31b04c0f5b 100644
--- a/pkgs/data/fonts/junicode/0.6.15.nix
+++ b/pkgs/data/fonts/junicode/0.6.15.nix
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		A Unicode font.
-";
+		description = "A Unicode font";
 		inherit src;
 	};
 }
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index aef45dcd96c..13b95326b2f 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -31,9 +31,7 @@ wrapFonts (stdenv.mkDerivation {
 	'';
 
 	meta = {
-		description = "
-			UCS-fonts - Unicode bitmap fonts.
-		";
+		description = "Unicode bitmap fonts";
 		src = [srcA srcB srcC];
 	};
 })
diff --git a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
index da520e96832..5d4866daf28 100644
--- a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
+++ b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
@@ -20,9 +20,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		A (mainly) Chinese Unicode font.
-";
+		description = "A (mainly) Chinese Unicode font";
 		inherit src;
 	};
 }
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index eb1d530dc00..68e3e9a32e8 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-data-0.2.0";
+  name = "poppler-data-0.2.1";
 
   src = fetchurl {
     url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "0cpa1krpd6xjbn1nv825z5p8v4cfcypdri4bhzvn2dnjy997x9k8";
+    sha256 = "0q56l5v89pnpkm1kqmwb1sx2zcx89q6bxz2hq2cpkq5f8kgvl3c9";
   };
 
   installFlags = "prefix=\${out}";
diff --git a/pkgs/data/misc/shared-mime-info/0.22.nix b/pkgs/data/misc/shared-mime-info/0.22.nix
deleted file mode 100644
index 399b3296d38..00000000000
--- a/pkgs/data/misc/shared-mime-info/0.22.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-args:
-import ./common.nix "1chz63v9jr009z9jhs07klybmhyf58i8vxipigf5gkdabjiclcyr" args
diff --git a/pkgs/data/misc/shared-mime-info/0.23.nix b/pkgs/data/misc/shared-mime-info/0.23.nix
deleted file mode 100644
index 38617dfe8e3..00000000000
--- a/pkgs/data/misc/shared-mime-info/0.23.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-args:
-import ./common.nix "080ny2vy00202hxcm7xm72j1zmyfs15dbsnqipwni6b2dg2am3q3" args
diff --git a/pkgs/data/misc/shared-mime-info/common.nix b/pkgs/data/misc/shared-mime-info/common.nix
deleted file mode 100644
index 8c2ff363c6a..00000000000
--- a/pkgs/data/misc/shared-mime-info/common.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-hash: args: with args;
-
-stdenv.mkDerivation rec {
-  name = "shared-mime-info-" + version;
-
-  src = fetchurl {
-    url = "http://freedesktop.org/~hadess/${name}.tar.bz2";
-    sha256 = hash;
-  };
-
-  buildInputs = [perl perlXMLParser pkgconfig gettext libxml2 glib];
-
-  meta = {
-    homepage = http://freedesktop.org/wiki/Software/shared-mime-info;
-  };
-}
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
new file mode 100644
index 00000000000..b151570c7f1
--- /dev/null
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, pkgconfig, gettext, intltool, libxml2, glib}:
+
+stdenv.mkDerivation rec {
+  name = "shared-mime-info-0.51";
+
+  src = fetchurl {
+    url = "http://freedesktop.org/~hadess/${name}.tar.bz2";
+    sha256 = "1n7fn3vnqdq5c4xjyflwryxdb75cwsmw39hdpjy90swd841pw90w";
+  };
+
+  buildInputs = [pkgconfig gettext intltool libxml2 glib];
+
+  meta = {
+    description = "A database of common MIME types";
+    homepage = http://freedesktop.org/wiki/Software/shared-mime-info;
+  };
+}