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.

Sign up for GitHub

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

lib/systems: don’t clobber "system" in parsed info #80820

Closed
wants to merge 1 commit into from
Closed

lib/systems: don’t clobber "system" in parsed info #80820

wants to merge 1 commit into from

Conversation

matthewbauer
Copy link
Member

We want to make sure something like this gives correct results:

$ nix eval '(import ./. { crossSystem.system = "armv7l-unknown-linux-gnueabihf"; }).stdenv.hostPlatform.system'

Previously this gave:

"armv7l-unknown-linux-gnueabihf"

now it gives:

"armv7l-linux"

Motivation for this change
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.

@matthewbauer
lib/systems: don’t clobber "system" in parsed info
030e79d 
We want to make sure something like this gives correct results:

$ nix eval '(import ./. { crossSystem.system = "armv7l-unknown-linux-gnueabihf"; }).stdenv.hostPlatform.system'

Previously this gave:

"armv7l-unknown-linux-gnueabihf"

now it gives:

"armv7l-linux"
Ericson2314
Ericson2314 approved these changes Feb 22, 2020
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops meant to request changes

Ericson2314
Ericson2314 requested changes Feb 22, 2020
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is overriding what the user wrote for system. I would rather make it an error to pass a system nix doesn't know about (e.g. one that doesn't have 2 components) or leave the behavior as-is before this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Ericson2314 requested changes

@nbp nbp Awaiting requested review from nbp

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
@matthewbauer @Ericson2314