Skip to content

[20.03] top-level: ignore unexpected args#99661

Merged
worldofpeace merged 2 commits intoNixOS:release-20.03from
cole-h:fix-nix-shell-and-borg-20.03
Oct 5, 2020
Merged

[20.03] top-level: ignore unexpected args#99661
worldofpeace merged 2 commits intoNixOS:release-20.03from
cole-h:fix-nix-shell-and-borg-20.03

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.

cole-h added 2 commits October 5, 2020 13:24
@cole-h
Revert "top-level: fix nix-shell eval w/nixUnstable"
0872da1 
This reverts commit fa6064a.

(cherry picked from commit d91cab8)
@cole-h
top-level: ignore unexpected args
b2a04c5 
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 review from Ericson2314 and nbp as code owners October 5, 2020 21:12
@cole-h cole-h requested a review from worldofpeace October 5, 2020 21:12
@cole-h cole-h mentioned this pull request Oct 5, 2020
Merged
10 tasks
@worldofpeace worldofpeace merged commit 041a242 into NixOS:release-20.03 Oct 5, 2020
@cole-h cole-h deleted the fix-nix-shell-and-borg-20.03 branch October 5, 2020 21:18
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Oct 5, 2020
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

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@cole-h @worldofpeace