Skip to content

Commit 821d827

Browse files
authored
iperf3: patch to exit with 0 on SIGTERM (NixOS#385398)
2 parents 584243a + ac6bf7c commit 821d827

File tree

1 file changed

+17
-7
lines changed
  • pkgs/tools/networking/iperf

1 file changed

+17
-7
lines changed

pkgs/tools/networking/iperf/3.nix

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,23 @@ stdenv.mkDerivation rec {
2424
"man"
2525
];
2626

27-
patches = lib.optionals stdenv.hostPlatform.isMusl [
28-
(fetchpatch {
29-
url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=7f979fc51ae31d5c695d8481ba84a4afc5080efb";
30-
name = "remove-pg-flags.patch";
31-
sha256 = "0z3zsmf7ln08rg1mmzl8s8jm5gp8x62f5cxiqcmi8dcs2nsxwgbi";
32-
})
33-
];
27+
patches =
28+
[
29+
# Patch to exit with 0 on SIGTERM, i.e. stop service cleanly under
30+
# systemd. Will be part of the next release.
31+
(fetchpatch {
32+
url = "https://github.com/esnet/iperf/commit/4bab9bc39d08069976c519868fefa11c35f6c3f0.patch";
33+
name = "exit-with-0-on-sigterm.patch";
34+
hash = "sha256-klW5UzPckJuZ/1Lx0hXJkGK+NyaqSn5AndBT4P+uajw=";
35+
})
36+
]
37+
++ lib.optionals stdenv.hostPlatform.isMusl [
38+
(fetchpatch {
39+
url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=7f979fc51ae31d5c695d8481ba84a4afc5080efb";
40+
name = "remove-pg-flags.patch";
41+
sha256 = "0z3zsmf7ln08rg1mmzl8s8jm5gp8x62f5cxiqcmi8dcs2nsxwgbi";
42+
})
43+
];
3444

3545
postInstall = ''
3646
ln -s $out/bin/iperf3 $out/bin/iperf

0 commit comments

Comments
 (0)