git.iko.soy/typeable/nixpkgs
on master help sign in
tcpflow: 1.5.2 -> 1.6.1

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.

commit682696deba6975c9b866229f32eba0d17ef248a5 authorMichael Weiss <dev.primeos@gmail.com> dateWed 24 Feb 2021, 18:34 (6 years ago) parent2c042fe
1 file changed+7−5
pkgs/tools/networking/tcpflow/default.nix+7−5
pkgs/tools/networking/tcpflow/default.nix+7−5
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "tcpflow";
8− version = "1.5.2";
8+ version = "1.6.1";
99
1010 src = fetchFromGitHub {
1111 owner = "simsong";
1212 repo = pname;
1313 rev = "${pname}-${version}";
14− sha256 = "063n3pfqa0lgzcwk4c0h01g2y5c3sli615j6a17dxpg95aw1zryy";
14+ sha256 = "0vbm097jhi5n8pg08ia1yhzc225zv9948blb76f4br739l9l22vq";
1515 fetchSubmodules = true;
1616 };
1717
@@ -23,8 +23,10 @@ stdenv.mkDerivation rec {
2323 substituteInPlace bootstrap.sh \
2424 --replace ".git" "" \
2525 --replace "/bin/rm" "rm"
26− substituteInPlace configure.ac \
27− --replace "1.5.1" "1.5.2"
26+ # Temporary fix for a build error:
27+ # https://src.fedoraproject.org/rpms/tcpflow/blob/979e250032b90de2d6b9e5b94b5203d98cccedad/f/tcpflow-1.6.1-format.patch
28+ substituteInPlace src/datalink.cpp \
29+ --replace 'DEBUG(6)(s.c_str());' 'DEBUG(6) ("%s", s.c_str());'
2830 '';
2931
3032 preConfigure = "bash ./bootstrap.sh";
@@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
3840 '';
3941 inherit (src.meta) homepage;
4042 license = licenses.gpl3;
41− maintainers = with maintainers; [ primeos raskin obadz ];
43+ maintainers = with maintainers; [ raskin obadz ];
4244 platforms = platforms.linux;
4345 };
4446}