diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2016-04-13 14:46:53 +0200 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2016-04-13 14:47:04 +0200 |
commit | 74f7916a9a4c0ebe8d7c5d5861c5694ea2d1583e (patch) | |
tree | b44e19d7c34bafa446a4c84d6e3baf86f7d98cc8 /pkgs | |
parent | 530fdc53620aabfb6e13a58b86f4ba5738b508a8 (diff) | |
download | nixpkgs-74f7916a9a4c0ebe8d7c5d5861c5694ea2d1583e.tar nixpkgs-74f7916a9a4c0ebe8d7c5d5861c5694ea2d1583e.tar.gz nixpkgs-74f7916a9a4c0ebe8d7c5d5861c5694ea2d1583e.tar.bz2 nixpkgs-74f7916a9a4c0ebe8d7c5d5861c5694ea2d1583e.tar.lz nixpkgs-74f7916a9a4c0ebe8d7c5d5861c5694ea2d1583e.tar.xz nixpkgs-74f7916a9a4c0ebe8d7c5d5861c5694ea2d1583e.tar.zst nixpkgs-74f7916a9a4c0ebe8d7c5d5861c5694ea2d1583e.zip |
iptables: add 1.6 branch (init 1.6.0). Not making it the default this time.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/iptables/1.6.nix | 33 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 38 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/iptables/1.6.nix b/pkgs/os-specific/linux/iptables/1.6.nix new file mode 100644 index 00000000000..88821a15d73 --- /dev/null +++ b/pkgs/os-specific/linux/iptables/1.6.nix @@ -0,0 +1,33 @@ +{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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10b6778c062..8d98ab11da1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10331,6 +10331,11 @@ 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 { }; |