MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #15198 from groxxda/bump/iptables

Browse source 
iptables: 1.4.21 -> 1.6.0
This commit is contained in:
Franz Pletz 2016-05-06 03:18:32 +02:00
commit 5c49790be5
3 changed files with 11 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/os-specific/linux/iptables/1.6.nix
View file

@ -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;
};
}

14
pkgs/os-specific/linux/iptables/default.nix
View file

@ -1,14 +1,22 @@
{stdenv, fetchurl}: {stdenv, fetchurl, bison, flex, libnetfilter_conntrack, libnftnl, libmnl}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "iptables-${version}"; name = "iptables-${version}";
version = "1.4.21"; # before updating check #12178 version = "1.6.0";
src = fetchurl { src = fetchurl {
url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; 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 = '' configureFlags = ''
--enable-devel --enable-devel
--enable-shared --enable-shared

5
pkgs/top-level/all-packages.nix
View file

@ -10474,11 +10474,6 @@ in
}; };
iptables = callPackage ../os-specific/linux/iptables { }; 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 { }; ipset = callPackage ../os-specific/linux/ipset { };