Merge remote-tracking branch 'origin/master' into x-updates

Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix

pkgs/data/misc/hicolor-icon-theme/default.nix

@@ -11,5 +11,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Default fallback theme used by implementations of the icon theme specification";
     homepage = http://icon-theme.freedesktop.org/releases/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/data/misc/mobile-broadband-provider-info/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 let
-  version = "20110511";
+  version = "20120614";
   pname = "mobile-broadband-provider-info";
   name = "${pname}-${version}";
 in
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
   inherit name;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.bz2";
-    sha256 = "0cny8bd6kdwvabnwdr00f4wp4xjbc8ynp0kcdg72c1q9186kdikj";
+    url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz";
+    sha256 = "72507a732e0cd16cf27424bb094b1c7a03e2206c119ad124722a283e587755f1";
   };
 
   meta = {

pkgs/data/misc/shared-desktop-ontologies/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "shared-desktop-ontologies-0.8.1";
+  name = "shared-desktop-ontologies-0.10.0";
   
   src = fetchurl {
     url = "mirror://sourceforge/oscaf/${name}.tar.bz2";
-    sha256 = "0w6rhhfjl5r6gv2jw3nc1sj5l4fxz4s1wv0iclcrak3wa5vyy6h3";
+    sha256 = "00y55bjmxrwiiw8q0n0jcv95l945hp7nglbwj408sk5m2vq026di";
   };
   
   buildInputs = [ cmake ];

pkgs/data/misc/tzdata/default.nix

@@ -0,0 +1,33 @@
+{ stdenv, fetchurl }:
+
+let version = "2012f"; in
+
+stdenv.mkDerivation rec {
+  name = "tzdata-${version}";
+
+  srcs =
+    [ (fetchurl {
+        url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
+        sha256 = "1k165i8g23rr0z26k02x1l4immp69g6yqjrd3lwmbvj5li4mmsdg";
+      })
+      (fetchurl {
+        url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
+        sha256 = "1m6rg9003mkjyvpv5gg5lcia9fzhy7ndwgs68qlpbipnw5p0k2pk";
+      })
+    ];
+
+  sourceRoot = ".";
+
+  makeFlags = "TOPDIR=$(out) TZDIR=$(out)/share/zoneinfo ETCDIR=$(TMPDIR)/etc LIBDIR=$(TMPDIR)/lib MANDIR=$(TMPDIR)/man AWK=awk";
+
+  postInstall =
+    ''
+      mv $out/share/zoneinfo-posix $out/share/zoneinfo/posix
+      mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right
+    '';
+
+  meta = {
+    homepage = http://www.iana.org/time-zones;
+    description = "Database of current and historical time zones";
+  };
+}