mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
Merge pull request #114262 from primeos/tcpflow
tcpflow: 1.5.2 -> 1.6.1
This commit is contained in:
commit
57231d7524
@ -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;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user