conntrack-tools: 1.4.4 -> 1.4.5
Fix build with libnetfilter_conntrack 1.0.7.
This commit is contained in:
parent
4e4fb65130
commit
70a041ea8b
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "conntrack-tools-${version}";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
|
||||
sha256 = "0v5spmlcw5n6va8z34f82vcpynadb0b54pnjazgpadf0qkyg9jmp";
|
||||
sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchgit, fetchFromGitHub, makeWrapper, git
|
||||
, python3, sshfs-fuse, torsocks, sshuttle, conntrack_tools }:
|
||||
, python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools }:
|
||||
|
||||
let
|
||||
sshuttle-telepresence = lib.overrideDerivation sshuttle (p: {
|
||||
|
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
|||
cp cli/telepresence $out/libexec/telepresence
|
||||
|
||||
makeWrapper $out/libexec/telepresence $out/bin/telepresence \
|
||||
--prefix PATH : ${lib.makeBinPath [python3 sshfs-fuse torsocks conntrack_tools sshuttle-telepresence]}
|
||||
--prefix PATH : ${lib.makeBinPath [python3 sshfs-fuse torsocks conntrack-tools sshuttle-telepresence]}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -56,6 +56,7 @@ mapAliases (rec {
|
|||
clawsMail = claws-mail; # added 2016-04-29
|
||||
clutter_gtk = clutter-gtk; # added 2018-02-25
|
||||
conkerorWrapper = conkeror; # added 2015-01
|
||||
conntrack_tools = conntrack-tools; # added 2018-05
|
||||
cool-old-term = cool-retro-term; # added 2015-01-31
|
||||
cupsBjnp = cups-bjnp; # added 2016-01-02
|
||||
cups_filters = cups-filters; # added 2016-08
|
||||
|
|
|
@ -13175,7 +13175,7 @@ with pkgs;
|
|||
pulseSupport = config.pulseaudio or false;
|
||||
} // config.conky or {});
|
||||
|
||||
conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { };
|
||||
conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { };
|
||||
|
||||
coredns = callPackage ../servers/dns/coredns { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue