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
@@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
    description = "A better i7 (and now i3, i5) reporting tool for Linux";
    homepage = http://code.google.com/p/i7z;
    repositories.git = https://github.com/ajaiantilal/i7z.git;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
  };
 }
-