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

cmake-language-server: fix test error on macOS #94213

Merged
merged 2 commits into from Jul 31, 2020

Conversation

r-burns
Copy link
Contributor

@r-burns r-burns commented Jul 30, 2020

Motivation for this change

This should fix Hydra's Darwin test failures for this package.
See regen100/cmake-language-server#24

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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 30, 2020
This should fix Hydra's Darwin test failures for this package.
See regen100/cmake-language-server#24
@@ -15,6 +16,12 @@ buildPythonApplication rec {
sha256 = "0vz7bjxkk0phjhz3h9kj6yr7wnk3g7lqmkqraa0kw12mzcfck837";
};

# can be removed after v0.1.2
patches = stdenv.lib.optional stdenv.isDarwin (fetchpatch {
url = "https://github.com/regen100/cmake-language-server/pull/24.patch";
Copy link
Contributor

Choose a reason for hiding this comment

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

please use the specific commit

Suggested change
url = "https://github.com/regen100/cmake-language-server/pull/24.patch";
url = "https://github.com/regen100/cmake-language-server/commit/0ec120f39127f25898ab110b43819e3e9becb8a3.patch";

Copy link
Contributor

@kira-bruneau kira-bruneau left a comment

Choose a reason for hiding this comment

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

I don't have a mac to test this on, but this looks good to me. Thanks @r-burns!

@marsam marsam merged commit 5e669ee into NixOS:master Jul 31, 2020
@r-burns r-burns deleted the cmake-language-server branch July 31, 2020 16:22
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

3 participants