Merge branch 'master' into staging-next

There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299

pkgs/os-specific/linux/nftables/default.nix

@@ -1,28 +1,35 @@
-{ stdenv, fetchurl, pkgconfig, docbook2x, docbook_xml_dtd_45
-, flex, bison, libmnl, libnftnl, gmp, readline }:
+{ stdenv, fetchurl, pkgconfig, bison, flex
+, libmnl, libnftnl, libpcap
+, gmp, jansson, readline
+, withXtables ? false , iptables
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "0.9.0";
+  version = "0.9.1";
   pname = "nftables";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2";
-    sha256 = "14bygs6vg2v448cw5r4pxqi8an29hw0m9vab8hpmgjmrzjsq30dd";
+    sha256 = "1kjg3dykf2aw76d76viz1hm0rav57nfbdwlngawgn2slxmlbplza";
   };
 
   configureFlags = [
-    "CONFIG_MAN=y"
-    "DB2MAN=docbook2man"
-  ];
+    "--disable-man-doc"
+    "--with-json"
+  ] ++ optional withXtables "--with-xtables";
 
-  XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
+  nativeBuildInputs = [ pkgconfig bison flex ];
 
-  nativeBuildInputs = [ pkgconfig docbook2x flex bison ];
-  buildInputs = [ libmnl libnftnl gmp readline ];
+  buildInputs = [
+    libmnl libnftnl libpcap
+    gmp readline jansson
+  ] ++ optional withXtables iptables;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";
-    homepage = http://netfilter.org/projects/nftables;
+    homepage = "https://netfilter.org/projects/nftables/";
     license = licenses.gpl2;
     platforms = platforms.linux;
   };