Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

pkgs/tools/misc/entr/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "entr-${version}";
-  version = "3.2";
+  version = "3.4";
 
   src = fetchurl {
     url = "http://entrproject.org/code/${name}.tar.gz";
-    sha256 = "0ikigpfzyjmr8j6snwlvxzqamrjbhlv78m8w1h0h7kzczc5f1vmi";
+    sha256 = "02h1drxn2lid2fwzwjpkp9p04l0g5a56v6jyj3gi3dzjsq7h0zff";
   };
 
   postPatch = ''
@@ -21,12 +21,11 @@ stdenv.mkDerivation rec {
   checkTarget = "test";
   installFlags = [ "PREFIX=$(out)" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://entrproject.org/;
     description = "Run arbitrary commands when files change";
-
-    license = stdenv.lib.licenses.isc;
-
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.isc;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ pSub ];
   };
 }