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
nixos/fish: fix completions patch #80456
Conversation
Upstream decided to split the lines we were patching out, so the patch would fail.
|
@GTrunSec Could you please post the logs here/somewhere? Otherwise, I can't do anything more to try and fix this. EDIT: The fact that it succeeded for @terlar makes me think either 1) you were just agreeing that this is a problem or 2) you didn't apply this properly (I don't know what the proper way is either, though, which is why I was unable to test it myself). |
Weird, for me it worked. |
yeh, it' worked.
sorry, when I deleted the building garbage, it worked for me. |
No worries, glad it worked! Thanks for trying it out and reporting back :) |
Who is the owner for this module? Or someone that could make a decision to merge this, feels safe, and won't break stuff more than they currently are on master : ) |
Repro:
If you cannot wait for the
in the output and run |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can confirm it fixes the build. Thanks.
I am not sure, but it seems fish installing does not work more.
That's the same edited file in this PR 🤔 |
You'll have to update your nixpkgs channel in order to get the fix. It was just merged yesterday, so you're probably still on an older revision. The most telltale sign of that is the patch fails at line 776 -- the updated patch is starts much later, at line 844. |
I'm using the latest unstable (commit e2b4abe) and I'm getting the same error. |
If you view the tree at that commit, you can see that this PR has not yet been incorporated: https://github.com/NixOS/nixpkgs/blob/e2b4abe3c8f2e09adfc6a52007841d1b96c89371/nixos/modules/programs/fish_completion-generator.patch. This means that the commit fixing this is only present on the master branch, and is not on any channels yet. I don't use NixOS, so I cannot give you any other solution than to switch to master until this PR has found its way into |
@cole-h Alright, thanks for clarifying. I was a little confused by your hint to "update the channel", since it was already updated. But it's fine, I'll simply wait a bit. :) |
I could have been a little clearer, sorry ;) It made sense to me because my |
Just a little update: according to https://howoldis.herokuapp.com/, |
Motivation for this change
Upstream decided to split the lines we were patching out, so the patch
would fail.
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)Fix #80423 (hopefully). cc @terlar -- could you test this? I don't have an easy way to test this on NixOS, currently.