Merge 'master' into staging

(relatively simple conflicts)

pkgs/data/documentation/man-pages/default.nix

@@ -1,21 +1,21 @@
 { stdenv, fetchurl }:
 
+let version = "3.83"; in
 stdenv.mkDerivation rec {
-  name = "man-pages-3.78";
+  name = "man-pages-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "0zm3sc0zbfng440jjqha8qnzivvg5nqpwgi7zv9h8qxwgyhrfa65";
+    sha256 = "1wksxxfvn8avfl01qk0i61zzgkkay29lpmbfal26a542yahydz3j";
   };
 
-  preBuild =
-    ''
-      makeFlagsArray=(MANDIR=$out/share/man)
-    '';
+  makeFlags = "MANDIR=$(out)/share/man";
 
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     description = "Linux development manual pages";
     homepage = http://www.kernel.org/doc/man-pages/;
     repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
+    maintainers = with maintainers; [ nckx ];
   };
 }

pkgs/data/documentation/zeal/default.nix

@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       app), available for Linux and Windows.
     '';
     homepage = "http://zealdocs.org/";
-    licenses = with stdenv.lib.licenses; [ gpl3 ];
+    license = with stdenv.lib.licenses; [ gpl3 ];
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };