Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

iperf3: symlink manpage to iperf & split man output #62610

Merged
merged 2 commits into from Jun 8, 2019
Merged

iperf3: symlink manpage to iperf & split man output #62610

merged 2 commits into from Jun 8, 2019

Conversation

Profpatsch
Copy link
Member

Closes: #62255

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Profpatsch Profpatsch requested review from fpletz and dezgeg June 3, 2019 13:52
@teto
Copy link
Member

teto commented Jun 4, 2019

Won't it collide with iperf2 ? like right now it's possible to run nix run nixpkgs.iperf2 nixpkgs.iperf3. Is it after your PR ?

fpletz
fpletz requested changes Jun 4, 2019
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we change the iperf3 binary to iperf, we also need the iperf2 binary to be called iperf2 with an iperf symlink. meta.priority can be used to modify which iperf symlink will be use when both are in the same environment.

@Profpatsch
Copy link
Member Author

Ah, then that was an oversight in a previous change. I’ll add a commit that does that.

@Profpatsch
iperf2: make binary symlink & prioritize iperf3
ff13282 
If both are in the environment, iperf3 should be used as `bin/iperf`
by default, for more consistency.
@Profpatsch
Copy link
Member Author

Okay, changed.

@Profpatsch Profpatsch requested a review from fpletz June 4, 2019 12:46
fpletz
fpletz approved these changes Jun 8, 2019
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@fpletz fpletz merged commit 3b58c72 into NixOS:master Jun 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz approved these changes

@dezgeg dezgeg Awaiting requested review from dezgeg

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

iperf manpage missing
3 participants
@Profpatsch @teto @fpletz