diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-05-30 05:54:48 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-05-30 05:54:48 +0000 |
| commit | 70a041ea8ba75a38f9fa2a4a83aad83599e56c55 (patch) | |
| tree | 5b4487355f56a8eab5dc8e7bef30159914add4d4 | |
| parent | 4e4fb651305251d02120d4ced7c1bc095eefef64 (diff) | |
| download | nixpkgs-70a041ea8ba75a38f9fa2a4a83aad83599e56c55.tar nixpkgs-70a041ea8ba75a38f9fa2a4a83aad83599e56c55.tar.gz nixpkgs-70a041ea8ba75a38f9fa2a4a83aad83599e56c55.tar.bz2 nixpkgs-70a041ea8ba75a38f9fa2a4a83aad83599e56c55.tar.lz nixpkgs-70a041ea8ba75a38f9fa2a4a83aad83599e56c55.tar.xz nixpkgs-70a041ea8ba75a38f9fa2a4a83aad83599e56c55.tar.zst nixpkgs-70a041ea8ba75a38f9fa2a4a83aad83599e56c55.zip | |
conntrack-tools: 1.4.4 -> 1.4.5
Fix build with libnetfilter_conntrack 1.0.7.
| -rw-r--r-- | pkgs/os-specific/linux/conntrack-tools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/telepresence/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 9736d7a8f4b..8f9983b5d6e 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -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 = [ diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index fe728dbbd0a..bbdaed4ccc0 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -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 = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5724adf16ad..458250acce6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ec08d9cf99..36779a37753 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |