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.

Sign up for GitHub

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

Netperf love #40202

Merged
merged 7 commits into from
May 12, 2018
Merged

Netperf love #40202

merged 7 commits into from
May 12, 2018
+18 −5

Conversation

mmlb
Copy link
Contributor

@mmlb mmlb commented May 9, 2018

Motivation for this change
  • Fix netperf builds
  • Update to a git checkout to pick up bug fixes since last release (~3 years ago)
  • Enable demo-mode, needed for new package I'll be submitting ( https://github.com/tohojo/flent )
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

mmlb added 5 commits May 9, 2018 00:07
@mmlb
netperf: fix build

Verified

This commit was signed with the committer’s verified signature.
almeidx Almeida
SSH Key Fingerprint: qS0Cyf/f5WBfKn8/H4i/7ypvfzpDKWVUeWx0miBkikA
Verified
Learn about vigilant mode
b2acd36
@mmlb
maintainers: add myself

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
733b942
@mmlb
netperf: add myself as maintainer

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
76a4f95
@mmlb
netperf: update to current git master to get bugfixes

Partially verified

This commit is signed with the committer’s verified signature.
Jiralite’s contribution has been verified via SSH key.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
144db52
@mmlb
netperf: enable-demo mode
1667d6b
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels May 9, 2018
matthewbauer
matthewbauer reviewed May 9, 2018
View reviewed changes
Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

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

Besides glibc this should be an ok change. You may want to see if setting doCheck=true works for you though.

pkgs/applications/networking/netperf/default.nix Outdated
};

buildInputs = [ glibc libsmbios ];
Copy link
Member

Choose a reason for hiding this comment

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

Glibc shouldn’t be here. It’s provided by the compiler.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

gotcha. I see a bunch of other nix files that take glibc would it be appropriate to go and try removing them in a separate PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@matthewbauer
Copy link
Member

@GrahamcOfBorg build netperf

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: netperf

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: netperf

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: netperf

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/gsbj02a3ikygpw0k2x58ljc1klqkp3r6-netperf-git
shrinking /nix/store/gsbj02a3ikygpw0k2x58ljc1klqkp3r6-netperf-git/bin/netperf
shrinking /nix/store/gsbj02a3ikygpw0k2x58ljc1klqkp3r6-netperf-git/bin/netserver
gzipping man pages under /nix/store/gsbj02a3ikygpw0k2x58ljc1klqkp3r6-netperf-git/share/man/
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/gsbj02a3ikygpw0k2x58ljc1klqkp3r6-netperf-git/bin
patching script interpreter paths in /nix/store/gsbj02a3ikygpw0k2x58ljc1klqkp3r6-netperf-git
checking for references to /build in /nix/store/gsbj02a3ikygpw0k2x58ljc1klqkp3r6-netperf-git...
/nix/store/gsbj02a3ikygpw0k2x58ljc1klqkp3r6-netperf-git

Mic92
Mic92 reviewed May 9, 2018
View reviewed changes
pkgs/applications/networking/netperf/default.nix Outdated

stdenv.mkDerivation rec {
name = "netperf-2.7.0";
name = "netperf-git";
Copy link
Member

Choose a reason for hiding this comment

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

Please make it date with the day of commit instead (ex. 2018-05-09).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

will do, I meant to write a note if I should do that since I saw that in other nix files but they looked autogenerated so I wasn't sure.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@teto
Copy link
Member

teto commented May 9, 2018

Looks good, you might want to rebase into 2 commits "maintainer addition"/"netperf update"
Looking forward for your flent package !

@mmlb
Copy link
Contributor Author

mmlb commented May 9, 2018

I can rebase into 2 commits for sure. I just didn't want to be doing all the things in one commit, and was waiting to see if anyone mentioned it.

@matthewbauer matthewbauer merged commit f245f53 into NixOS:master May 12, 2018
@mmlb mmlb deleted the netperf-love branch May 12, 2018 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer

@Mic92 Mic92

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mmlb @matthewbauer @GrahamcOfBorg @teto @Mic92