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
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://code.google.com/p/udptunnel/;
    description = "Tunnels TCP over UDP packets";
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
    maintainers = with stdenv.lib.maintainers; [viric];
    platforms = with stdenv.lib.platforms; linux;
  };