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

Conflicts:
	pkgs/stdenv/generic/default.nix

pkgs/tools/typesetting/biber/default.nix

@@ -33,7 +33,7 @@ buildPerlPackage {
 
   meta = {
     description = "Backend for BibLaTeX";
-    license = "perl";
+    license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.ttuegel ];
   };

pkgs/tools/typesetting/pdfgrep/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "a tool to search text in PDF files";
     homepage = http://pdfgrep.sourceforge.net/;
-    license = "free";
+    license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [qknight];
     platforms = with stdenv.lib.platforms; linux;
   };

pkgs/tools/typesetting/tex/disser/default.nix

@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , unzip, texLive, texLiveCMSuper, texLiveAggregationFun
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     ["texLive" "texLiveCMSuper" "texLiveAggregationFun"];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -36,7 +36,7 @@ rec {
   '';
 
   makeFlags = ["DESTDIR=$out/share/texmf-dist"];
-      
+
   meta = {
     description = "Russian PhD thesis LaTeX package";
     maintainers = with a.lib.maintainers;
@@ -45,7 +45,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux; # platform-independent
-    license = "free"; # LaTeX Project Public License
+    license = a.lib.licenses.free; # LaTeX Project Public License
   };
   passthru = {
     updateInfo = {
@@ -53,4 +53,3 @@ rec {
     };
   };
 }) x
-

pkgs/tools/typesetting/tex/tex4ht/default.nix

@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://tug.org/tex4ht/";
     description = "a system to convert (La)TeX documents to HTML and various other formats";
-    license = "LPPL-1.2";		# LaTeX Project Public License
+    license = stdenv.lib.licenses.lppl12;
   };
 }