Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 497872c29452
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3b58c7206b8d
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 3, 2019

  1. iperf3: symlink manpage to iperf & split man output 

    Closes: #62255
    @Profpatsch
    Profpatsch committed Jun 3, 2019
    Copy the full SHA
    347bf16 View commit details

Commits on Jun 4, 2019

  1. iperf2: make binary symlink & prioritize iperf3 

    If both are in the environment, iperf3 should be used as `bin/iperf`
by default, for more consistency.
    @Profpatsch
    Profpatsch committed Jun 4, 2019
    Copy the full SHA
    ff13282 View commit details

Commits on Jun 8, 2019

  1. Merge pull request #62610 from Profpatsch/iperf3-symlink-manpage 

    iperf3: symlink manpage to iperf & split man output
    @fpletz
    fpletz authored Jun 8, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3b58c72 View commit details
Showing with 12 additions and 1 deletion.
  1. +8 −0 pkgs/tools/networking/iperf/2.nix
  2. +4 −1 pkgs/tools/networking/iperf/3.nix
8 changes: 8 additions & 0 deletions pkgs/tools/networking/iperf/2.nix
View file
Original file line number Diff line number Diff line change
@@ -11,10 +11,18 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
configureFlags = [ "--enable-fastsampling" ];

postInstall = ''
mv $out/bin/iperf $out/bin/iperf2
ln -s $out/bin/iperf2 $out/bin/iperf
'';

meta = with stdenv.lib; {
homepage = https://sourceforge.net/projects/iperf/;
description = "Tool to measure IP bandwidth using UDP or TCP";
platforms = platforms.unix;
license = licenses.mit;

# prioritize iperf3
priority = 10;
};
}
5 changes: 4 additions & 1 deletion pkgs/tools/networking/iperf/3.nix
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {

buildInputs = [ openssl ];

outputs = [ "out" "man" ];

patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=99ec9e1c84e338629cf1b27b0fdc808bde4d8564";
@@ -19,7 +21,8 @@ stdenv.mkDerivation rec {
];

postInstall = ''
ln -s iperf3 $out/bin/iperf
ln -s $out/bin/iperf3 $out/bin/iperf
ln -s $man/share/man/man1/iperf3.1 $man/share/man/man1/iperf.1
'';

meta = with stdenv.lib; {