diff --git a/pkgs/os-specific/linux/iptables/1.6.nix b/pkgs/os-specific/linux/iptables/1.6.nix deleted file mode 100644 index 88821a15d73e..000000000000 --- a/pkgs/os-specific/linux/iptables/1.6.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index ba3ee64f08ba..8c815029661b 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,14 +1,22 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, bison, flex, libnetfilter_conntrack, libnftnl, libmnl}: stdenv.mkDerivation rec { name = "iptables-${version}"; - version = "1.4.21"; # before updating check #12178 + version = "1.6.0"; src = fetchurl { url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; - sha256 = "1q6kg7sf0pgpq0qhab6sywl23cngxxfzc9zdzscsba8x09l4q02j"; + sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb"; }; + nativeBuildInputs = [bison flex]; + + buildInputs = [libnetfilter_conntrack libnftnl libmnl]; + + preConfigure = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl" + ''; + configureFlags = '' --enable-devel --enable-shared diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40d59a52931b..4231e63409d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10474,11 +10474,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 { };