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.
This commit is contained in:
parent
2c042fe9c8
commit
682696deba
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tcpflow";
|
pname = "tcpflow";
|
||||||
version = "1.5.2";
|
version = "1.6.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "simsong";
|
owner = "simsong";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "${pname}-${version}";
|
rev = "${pname}-${version}";
|
||||||
sha256 = "063n3pfqa0lgzcwk4c0h01g2y5c3sli615j6a17dxpg95aw1zryy";
|
sha256 = "0vbm097jhi5n8pg08ia1yhzc225zv9948blb76f4br739l9l22vq";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -23,8 +23,10 @@ stdenv.mkDerivation rec {
|
||||||
substituteInPlace bootstrap.sh \
|
substituteInPlace bootstrap.sh \
|
||||||
--replace ".git" "" \
|
--replace ".git" "" \
|
||||||
--replace "/bin/rm" "rm"
|
--replace "/bin/rm" "rm"
|
||||||
substituteInPlace configure.ac \
|
# Temporary fix for a build error:
|
||||||
--replace "1.5.1" "1.5.2"
|
# 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";
|
preConfigure = "bash ./bootstrap.sh";
|
||||||
|
@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
inherit (src.meta) homepage;
|
inherit (src.meta) homepage;
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
maintainers = with maintainers; [ primeos raskin obadz ];
|
maintainers = with maintainers; [ raskin obadz ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue