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

Conflicts: pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
parent 9253a95f6b b35770818d
commit 2d326e5032
1261 changed files with 4697 additions and 3318 deletions
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
  meta = {
    homepage = "http://code.google.com/p/modwsgi/";
    description = "Host Python applications in Apache through the WSGI interface";
-    license = "ASL2.0";
+    license = stdenv.lib.licenses.asl20;

    platforms = stdenv.lib.platforms.linux;
    maintainers = [ stdenv.lib.maintainers.simons ];
@@ -35,7 +35,7 @@ let version = "0.11"; in

      homepage = http://www.gnu.org/software/myserver/;

-      license = "GPLv3+";
+      license = stdenv.lib.licenses.gpl3Plus;

      maintainers = [ ];