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

top-level: ignore unexpected args #99316

Merged
merged 2 commits into from Oct 5, 2020
Merged

Conversation

@cole-h
Copy link
Member

@cole-h cole-h commented Oct 1, 2020

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.nix so that we don't error on unexpected arguments. This allows nix-shell -A hello to 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
  • 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.

cc @Ma27 @worldofpeace

cole-h added 2 commits Oct 1, 2020
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).
@cole-h cole-h requested review from Ericson2314 and nbp as code owners Oct 1, 2020
@cole-h cole-h requested review from Ma27 and worldofpeace Oct 1, 2020
Ma27
Ma27 approved these changes Oct 1, 2020
Copy link
Member

@glittershark glittershark left a comment

🎉

@Infinisil Infinisil merged commit 1781e11 into NixOS:master Oct 5, 2020
16 checks passed
@cole-h cole-h deleted the fix-nix-shell-and-borg branch Oct 5, 2020
@cole-h
Copy link
Member Author

@cole-h cole-h commented Oct 5, 2020

Backported in #99657 and #99661.

@cole-h
Copy link
Member Author

@cole-h cole-h commented Oct 6, 2020

Just a quick note: ofborg's aarch64 builds appear to be succeeding again! Woohoo!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants