Skip to content

lib/systems: remove redundant test from selectEmulator#238480

Merged
wegank merged 1 commit intomasterfrom
unknown repository
Jun 19, 2023
Merged

lib/systems: remove redundant test from selectEmulator#238480
wegank merged 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Jun 18, 2023

Description of changes

Commit eef4bbd changed the conditional in selectEmulator from isCompatible (which examines only the CPU, rather than the entire platform) to canExecute. This made the first conjunct redundant. Let's drop the redundant part.

#238331 (comment)

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Commit eef4bbd changed the conditional in selectEmulator from
`isCompatible` (which examines only the CPU, rather than the entire
platform) to `canExecute`.  This made the first conjunct redundant.
Let's drop the redundant part.

#238331 (comment)
@ghost ghost requested review from Ericson2314, alyssais and matthewbauer as code owners June 18, 2023 21:51
@ghost ghost mentioned this pull request Jun 18, 2023
12 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jun 18, 2023
@wegank wegank merged commit 50f3cc9 into NixOS:master Jun 19, 2023
@ghost ghost deleted the pr/lib-systems-redundant branch June 19, 2023 05:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants