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

Jump to bottom

[20.09] top-level: ignore unexpected args #99657

Merged
merged 2 commits into from Oct 5, 2020
Merged

[20.09] top-level: ignore unexpected args #99657

merged 2 commits into from Oct 5, 2020

Conversation

cole-h
Copy link
Member

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

Motivation for this change

Backport #99316.

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.

Should I revert the backported top-level: fix nix-shell eval w/nixUnstable (c1dbaed), or is it fine to leave the revert referencing the master commit?

@cole-h
Revert "top-level: fix nix-shell eval w/nixUnstable"
9f76b6e 
This reverts commit fa6064a.

(cherry picked from commit d91cab8)
@cole-h
top-level: ignore unexpected args
c2c7a5c 
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).

(cherry picked from commit 11eddd6)
@cole-h cole-h requested a review from infinisil October 5, 2020 20:28
@worldofpeace worldofpeace merged commit 9b36117 into NixOS:release-20.09 Oct 5, 2020
@cole-h cole-h deleted the fix-nix-shell-and-borg-20.09 branch October 5, 2020 21:10
@cole-h cole-h mentioned this pull request Oct 5, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 is a code owner

@nbp nbp Awaiting requested review from nbp

@infinisil infinisil Awaiting requested review from infinisil

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@cole-h @worldofpeace