Merge branch master into x-updates

Conflicts (trivial, minor update on master, major here): pkgs/development/libraries/mesa/default.nix
2013-11-16 20:32:44 +01:00
parent 8e0d77632e b5356f7f27
commit 68430cf3d7
360 changed files with 7686 additions and 9191 deletions
@@ -30,10 +30,8 @@ stdenv.mkDerivation rec {

  meta = {
    description = "A library for image loading and manipulation";
-
    homepage = http://library.gnome.org/devel/gdk-pixbuf/;
-
    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
  };
 }