Merge remote-tracking branch 'origin/master' into staging.

Conflicts:
	pkgs/desktops/e18/enlightenment.nix

pkgs/applications/misc/librecad/2.0.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     description = "A 2D CAD package based upon Qt";
     homepage = http://librecad.org;
     repositories.git = git://github.com/LibreCAD/LibreCAD.git;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };

pkgs/applications/misc/librecad/default.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A 2D CAD package based upon Qt";
     homepage = http://librecad.org;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };