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

rls: add llvm to buildInputs #80602

Merged
merged 1 commit into from Feb 20, 2020
Merged

rls: add llvm to buildInputs #80602

merged 1 commit into from Feb 20, 2020

Conversation

cole-h
Copy link
Member

@cole-h cole-h commented Feb 20, 2020

The Hydra build [1] was failing because it was unable to link LLVM-9.
Additionally, quote the homepage URL for compliance with RFC 45.

[1] https://hydra.nixos.org/build/112823631/nixlog/2

Part of ZHF: #80379

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

If rustPlatform.rust.rustc.llvm is too ugly, I could add rustc to the function arguments and use rustc.llvm to look similar to that of my clippy PR (#80401).

@cole-h
rls: add llvm to buildInputs
2edec09 
The Hydra build [1] was failing because it was unable to link `LLVM-9`.
Additionally, quote the homepage URL for compliance with RFC 45.

[1] https://hydra.nixos.org/build/112823631/nixlog/2
@jonringer
Copy link
Contributor

probably just my personal taste, but I would say something that expresses my "intent". so rls: add missing llvm dependency or rls: fix build. add llvm to buildInputs is very clear as to what you did, but not why you did that.

that being said, diff LGTM

jonringer
jonringer approved these changes Feb 20, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

diff LGTM
fixes broken build

[2 built, 9 copied (950.3 MiB), 367.2 MiB DL]
https://github.com/NixOS/nixpkgs/pull/80602
1 package built:
rls

@jonringer
Copy link
Contributor

@GrahamcOfBorg build rls

@cole-h
Copy link
Member Author

cole-h commented Feb 20, 2020

If I come back in the morning and darwin has built successfully (which it should) and this hasn't been merged yet, I'll fix up the commit title. Otherwise, the message body should good enough (although not obvious until someone git blames it and actually views the commit...).

@Mic92 Mic92 merged commit e657a87 into NixOS:master Feb 20, 2020
@cole-h cole-h mentioned this pull request Feb 20, 2020
Merged
10 tasks
@cole-h cole-h deleted the rls branch February 20, 2020 19:58
@cole-h cole-h mentioned this pull request Feb 24, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KamilaBorowska KamilaBorowska KamilaBorowska approved these changes

@jonringer jonringer jonringer approved these changes

@LnL7 LnL7 Awaiting requested review from LnL7

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@symphorien symphorien Awaiting requested review from symphorien

@bhipple bhipple Awaiting requested review from bhipple

Assignees
No one assigned
Labels
6.topic: rust 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@cole-h @jonringer @KamilaBorowska @Mic92