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 #175601 from helsinki-systems/upd/nftables

Browse source 
nftables: 1.0.2 -> 1.0.4
This commit is contained in:
ajs124 2022-06-08 22:24:34 +02:00 committed by GitHub
commit 47719e6aa8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libnftnl/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, pkg-config, libmnl }:
stdenv.mkDerivation rec {
version = "1.2.1";
version = "1.2.2";
pname = "libnftnl";
src = fetchurl {
url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
sha256 = "0z4khm2mnys9mcl8ckwf19cw20jgrv8650nfncy3xcgs2k2aa23m";
hash = "sha256-nvwAT50VkY1o+emOGU1V4DAWjzO7Z8PnpUW3QMntbQo=";
};
nativeBuildInputs = [ pkg-config ];

22
pkgs/os-specific/linux/nftables/default.nix
View file

@ -1,25 +1,25 @@
{ lib, stdenv, fetchurl, pkg-config, bison, file, flex
{ lib, stdenv, fetchurl, pkg-config, bison, flex
, asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl
, libmnl, libnftnl, libpcap
, gmp, jansson, libedit
, autoreconfHook, fetchpatch
, autoreconfHook
, withDebugSymbols ? false
, withPython ? false , python3
, withXtables ? true , iptables
}:
stdenv.mkDerivation rec {
version = "1.0.2";
version = "1.0.4";
pname = "nftables";
src = fetchurl {
url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2";
sha256 = "00jcjn1pl7qyqpg8pd4yhlkys7wbj4vkzgg73n27nmplzips6a0b";
hash = "sha256-kn+x/qH2haMowQz3ketlXX4e1J0xDupcsxAd/Y1sujU=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config bison file flex
pkg-config bison flex
asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt
];
@ -29,18 +29,6 @@ stdenv.mkDerivation rec {
] ++ lib.optional withXtables iptables
++ lib.optional withPython python3;
preConfigure = ''
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
'';
patches = [
# fix build after 1.0.2 release, drop when updating to a newer release
(fetchpatch {
url = "https://git.netfilter.org/nftables/patch/?id=18a08fb7f0443f8bde83393bd6f69e23a04246b3";
sha256 = "03dzhd7fhg0d20ly4rffk4ra7wlxp731892dhp8zw67jwhys9ywz";
})
];
configureFlags = [
"--with-json"
"--with-cli=editline"