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
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {

    homepage = http://www.andyetitmoves.net/;

-    license = "unfree";
+    license = stdenv.lib.licenses.unfree;

    maintainers = with stdenv.lib.maintainers; [bluescreen303];
  };