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

htop: 2.02 -> 2.1.0 #34625

Merged
merged 1 commit into from Feb 5, 2018
Merged

htop: 2.02 -> 2.1.0 #34625

merged 1 commit into from Feb 5, 2018

Conversation

magnetophon
Copy link
Member

@magnetophon magnetophon commented Feb 5, 2018

Motivation for this change
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.

};

buildInputs =
[ ncurses ] ++
[ ncurses python ] ++
Copy link
Member

Choose a reason for hiding this comment

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

Isn't it sufficient to put this in nativeBuildInputs?

Copy link
Member

Choose a reason for hiding this comment

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

Indeed 👍
It's only used for build time code generation

lib.optionals stdenv.isDarwin [ IOKit ];

patchPhase = ''
Copy link
Member

Choose a reason for hiding this comment

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

I think it's better to use post/prePatch.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, either is fine. I always tend to use prePatch. You should usually not touch the patchPhase unless really required. If we ever need the standard patches attribute with this derivation not having to rename other attributes would be great :-)


stdenv.mkDerivation rec {
name = "htop-${version}";
version = "2.0.2";
Copy link
Member

Choose a reason for hiding this comment

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

Your commit message states 2.02. Can you please change that to 2.0.2?

lib.optionals stdenv.isDarwin [ IOKit ];

patchPhase = ''
Copy link
Member

Choose a reason for hiding this comment

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

Yes, either is fine. I always tend to use prePatch. You should usually not touch the patchPhase unless really required. If we ever need the standard patches attribute with this derivation not having to rename other attributes would be great :-)

@magnetophon
Copy link
Member Author

@dotlambda Thanks for the feedback. Done.

@adisbladis adisbladis merged commit a16ccac into NixOS:master Feb 5, 2018
@adisbladis
Copy link
Member

Thanks! :)

@magnetophon magnetophon deleted the htop branch February 5, 2018 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants