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
--- a/pkgs/tools/text/enscript/default.nix
+++ b/pkgs/tools/text/enscript/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
         it has many options that can be used to customize printouts.
      '';

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

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