* Sync with the trunk.

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

5 files changed, 19 insertions, 22 deletions

diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index eb1d530dc007..68e3e9a32e8f 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 399b3296d382..000000000000
--- 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 38617dfe8e3f..000000000000
--- 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 8c2ff363c6af..000000000000
--- 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 000000000000..b151570c7f11
--- /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;
+  };
+}