-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
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
ripgrep: fix shell completions when cross compiling #271072
Conversation
combed through the output of |
8631ddf
to
d8dcdda
Compare
The change in here looks good, however I spotted another issue: the installCheckPhase will never be run on cross builds (that's hard-wired in I'm not keen on skipping a basic functionality test just because of some shortcomings in the current stdenv. A possible workaround which forces the face to be executed is diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 8aa91640fd1f..b16b350757e4 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -42,7 +42,10 @@ in rustPlatform.buildRustPackage rec {
--zsh <(${rg} --generate complete-zsh)
'';
- doInstallCheck = canRunRg;
+ postInstall = ''
+ export doInstallCheck=${toString canRunRg}
+ '';
+
installCheckPhase = ''
file="$(mktemp)"
echo "abc\nbcd\ncde" > "$file" Opinions? |
I don't really care if we run the tests on cross. |
d8dcdda
to
71b9377
Compare
Thanks! And sorry for the long wait! |
Description of changes
#270521 fixed cross compilation but the result was missing shell completions. this patch fixes shell completions too.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Priorities
Add a 👍 reaction to pull requests you find important.