nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 00:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114262 from primeos/tcpflow

Browse Source 
tcpflow: 1.5.2 -> 1.6.1
This commit is contained in:
Sandro 2021-02-25 09:16:01 +01:00 committed by GitHub
commit 57231d7524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { 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;
}; };
} }