mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-03-16 09:02:36 +00:00
Code Issues Wiki Activity

tcpflow: 1.5.2 -> 1.6.1

Browse source 
The substituteInPlace "patch" is required to fix the following build error:
datalink.cpp:177:27: error: format not a string literal and no format
arguments
[8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wformat-security-Werror=format-security8;;]
  177 |         DEBUG(6)(s.c_str());
      |                           ^

This also removes me as maintainer since I don't use tcpflow anymore.
This commit is contained in:
Michael Weiss 2021-02-24 18:34:24 +01:00
parent 2c042fe9c8
commit 682696deba
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/networking/tcpflow/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "tcpflow";
version = "1.5.2";
version = "1.6.1";
src = fetchFromGitHub {
owner = "simsong";
repo = pname;
rev = "${pname}-${version}";
sha256 = "063n3pfqa0lgzcwk4c0h01g2y5c3sli615j6a17dxpg95aw1zryy";
sha256 = "0vbm097jhi5n8pg08ia1yhzc225zv9948blb76f4br739l9l22vq";
fetchSubmodules = true;
};
@ -23,8 +23,10 @@ stdenv.mkDerivation rec {
substituteInPlace bootstrap.sh \
--replace ".git" "" \
--replace "/bin/rm" "rm"
substituteInPlace configure.ac \
--replace "1.5.1" "1.5.2"
# Temporary fix for a build error:
# https://src.fedoraproject.org/rpms/tcpflow/blob/979e250032b90de2d6b9e5b94b5203d98cccedad/f/tcpflow-1.6.1-format.patch
substituteInPlace src/datalink.cpp \
--replace 'DEBUG(6)(s.c_str());' 'DEBUG(6) ("%s", s.c_str());'
'';
preConfigure = "bash ./bootstrap.sh";
@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
'';
inherit (src.meta) homepage;
license = licenses.gpl3;
maintainers = with maintainers; [ primeos raskin obadz ];
maintainers = with maintainers; [ raskin obadz ];
platforms = platforms.linux;
};
}