Merge recent master into x-updates

Hydra: ?compare=1142825 Conflicts (easy): pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
parent 91b53aaebc fb565f1a4e
commit 6295a3ca36
1391 changed files with 6647 additions and 5597 deletions
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://pixman.org;
    description = "A low-level library for pixel manipulation";
-    license = "MIT";
+    license = stdenv.lib.licenses.mit;
  };
 }