Revert "iptables: add 1.6 branch (init 1.6.0). Not making it the default this time."

This reverts commit 74f7916a9a4c0ebe8d7c5d5861c5694ea2d1583e.

Time to make it the default.

pkgs/os-specific/linux/iptables/1.6.nix

@@ -1,33 +0,0 @@
-{stdenv, fetchurl, bison, flex, libnetfilter_conntrack, libnftnl, libmnl}:
-
-stdenv.mkDerivation rec {
-  name = "iptables-${version}";
-  version = "1.6.0";
-
-  src = fetchurl {
-    url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
-    sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb";
-  };
-
-  nativeBuildInputs = [bison flex];
-
-  buildInputs = [libnetfilter_conntrack libnftnl libmnl];
-  
-  preConfigure = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
-  '';
-
-  configureFlags = ''
-    --enable-devel
-    --enable-shared
-  '';
-
-  meta = {
-    description = "A program to configure the Linux IP packet filtering ruleset";
-    homepage = http://www.netfilter.org/projects/iptables/index.html;
-    platforms = stdenv.lib.platforms.linux;
-    downloadPage = "http://www.netfilter.org/projects/iptables/files/";
-    updateWalker = true;
-    inherit version;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -10436,11 +10436,6 @@ in
   };
 
   iptables = callPackage ../os-specific/linux/iptables { };
-  # The freshest version — possibly crashing connmand?
-  # https://github.com/NixOS/nixpkgs/commit/fe00c8a83f696e3430ee4aa3fc850f171da52450
-  iptables_16 = callPackage ../os-specific/linux/iptables/1.6.nix {
-    flex = flex_2_5_35;
-  };
 
   ipset = callPackage ../os-specific/linux/ipset { };