Merge master into staging

pkgs/tools/text/dos2unix/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     --replace /usr $out
     '';
 
-  buildInputs = [ perl gettext ];
+  nativeBuildInputs = [ perl gettext ];
 
   meta = with stdenv.lib; {
     homepage = http://waterlan.home.xs4all.nl/dos2unix.html;

pkgs/tools/text/par/default.nix

@@ -28,9 +28,11 @@ stdenv.mkDerivation {
   '';
 
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.nicemice.net/par/;
     description = "Paragraph reflow for email";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    # See https://fedoraproject.org/wiki/Licensing/Par for license details
+    license = licenses.free;
   };
 }