Merge branch 'master' into stdenv-updates

Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.

pkgs/top-level/python-packages.nix

@@ -2502,6 +2502,28 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  pyglet = buildPythonPackage rec {
+    name = "pyglet-1.1.4";
+
+    src = fetchurl {
+      url = "http://pyglet.googlecode.com/files/${name}.tar.gz";
+      sha256 = "048n20d606i3njnzhajadnznnfm8pwchs43hxs50da9p79g2m6qx";
+    };
+
+    patchPhase = let
+      libs = [ pkgs.mesa pkgs.xlibs.libX11 pkgs.freetype pkgs.fontconfig ];
+      paths = pkgs.lib.concatStringsSep "," (map (l: "\"${l}/lib\"") libs);
+    in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py";
+
+    doCheck = false;
+
+    meta = {
+      homepage = "http://www.pyglet.org/";
+      description = "A cross-platform windowing and multimedia library";
+      license = stdenv.lib.licenses.bsd3;
+    };
+  };
+
   pygments = buildPythonPackage rec {
     name = "Pygments-1.5";
 
@@ -2768,6 +2790,24 @@ pythonPackages = python.modules // rec {
   });
 
 
+  pyserial = buildPythonPackage rec {
+    name = "pyserial-2.6";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyserial/${name}.tar.gz";
+      md5 = "cde799970b7c1ce1f7d6e9ceebe64c98";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = "http://pyserial.sourceforge.net/";
+      license = stdenv.lib.licenses.psfl;
+      description = "Python serial port extension";
+    };
+  };
+
+
   pysqlite = buildPythonPackage (rec {
     name = "pysqlite-2.5.5";