Merge remote-tracking branch 'upstream/master' into HEAD

pkgs/tools/text/grin/default.nix

@@ -15,7 +15,7 @@ python2Packages.buildPythonApplication rec {
   meta = {
     homepage = https://pypi.python.org/pypi/grin;
     description = "A grep program configured the way I like it";
-    platform = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.sjagoe ];
   };
 }

pkgs/tools/text/xml/jing-trang/default.nix

@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     # The homepage is www.thaiopensource.com, but it links to googlecode.com
     # for downloads and call it the "project site".
     homepage = http://www.thaiopensource.com/relaxng/jing.html;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
 }

pkgs/tools/text/xsv/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform }:
 
 with rustPlatform;