top-level: ignore unexpected args#99316
Merged
infinisil merged 2 commits intoNixOS:masterfrom Oct 5, 2020
Merged
Conversation
This reverts commit fa6064a.
This fixes both `nix-shell` failing to eval with `nixUnstable`, as well as ofborg's failure to eval on aarch64 due to passing an "unexpected arg" (https://github.com/NixOS/ofborg/blob/1112e3a8c8621203fae71283d700e0383b5e1e80/ofborg/src/nix.rs#L334-L340).
Ma27
approved these changes
Oct 1, 2020
10 tasks
infinisil
approved these changes
Oct 5, 2020
This was referenced Oct 5, 2020
Member
Author
Member
Author
|
Just a quick note: ofborg's aarch64 builds appear to be succeeding again! Woohoo! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation for this change
This reverts #97807 and instead implements @glittershark's suggestion (NixOS/nix#4003 (comment)) to use an ellipsis in
pkgs/top-level/default.nixso that we don't error on unexpected arguments. This allowsnix-shell -A helloto work properly, as well as (hopefully -- we won't know for sure until the community box gets redeployed next) allows ofborg's aarch64 builds + evals to succeed again (for an example of the brokenness, see: https://logs.nix.ci/?key=nixos/nixpkgs.99076&attempt_id=d128c36f-72ef-49ab-8e8e-ab40f34347ef).Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)cc @Ma27 @worldofpeace