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

rls: 1.31.7 -> 1.34.0 #60181

Merged
merged 1 commit into from Apr 25, 2019
Merged

rls: 1.31.7 -> 1.34.0 #60181

merged 1 commit into from Apr 25, 2019

Conversation

symphorien
Copy link
Member

Motivation for this change

Fix rls with rustc 1.34

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.

@dywedir
Copy link
Member

dywedir commented Apr 25, 2019

@GrahamcOfBorg build rls

@dywedir
Copy link
Member

dywedir commented Apr 25, 2019

It looks like macOS build can be fixed with

- buildInputs = [ openssh openssl curl zlib ];
+ buildInputs = [ openssh openssl curl zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];

@symphorien
Copy link
Member Author

I added libiconv unconditionnally because it would also be needed on musl on linux etc.

@dywedir
Copy link
Member

dywedir commented Apr 25, 2019

@dywedir
Copy link
Member

dywedir commented Apr 25, 2019

@symphorien thanks!

@dywedir dywedir merged commit 6a0f108 into NixOS:master Apr 25, 2019
@symphorien symphorien deleted the rls-1.34 branch May 18, 2019 15:58
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

2 participants