Skip to content

ruff: only generate completions if program can be executed#317572

Merged
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
SFrijters:ruff-fix-completion
Jul 6, 2024
Merged

ruff: only generate completions if program can be executed#317572
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
SFrijters:ruff-fix-completion

Conversation

@SFrijters
Copy link
Member

Description of changes

Getting ahead of #289517 for cross builds.

Fixes

$ nix build .#pkgsCross.aarch64-multiplatform.ruff -L
[...]
ruff-aarch64-unknown-linux-gnu> /nix/store/l30525lnvzaiwqihqzspgrljmvjfx9j6-stdenv-linux/setup: line 114: /nix/store/4ws8s0ri2si18djfz9pps62pj208mihf-ruff-aarch64-unknown-linux-gnu-0.4.7/bin/ruff: cannot execute binary file: Exec format error
ruff-aarch64-unknown-linux-gnu> /nix/store/l30525lnvzaiwqihqzspgrljmvjfx9j6-stdenv-linux/setup: line 114: /nix/store/4ws8s0ri2si18djfz9pps62pj208mihf-ruff-aarch64-unknown-linux-gnu-0.4.7/bin/ruff: cannot execute binary file: Exec format error
ruff-aarch64-unknown-linux-gnu> /nix/store/l30525lnvzaiwqihqzspgrljmvjfx9j6-stdenv-linux/setup: line 114: /nix/store/4ws8s0ri2si18djfz9pps62pj208mihf-ruff-aarch64-unknown-linux-gnu-0.4.7/bin/ruff: cannot execute binary file: Exec format error

which will cause errors.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

@SFrijters SFrijters requested a review from figsoda June 5, 2024 21:46
@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 Jun 5, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 4, 2024
@SFrijters SFrijters force-pushed the ruff-fix-completion branch from 52650b8 to 7046b87 Compare July 5, 2024 18:30
@SFrijters
Copy link
Member Author

Rebased to fix merge conflicts.

@SFrijters SFrijters requested a review from GaetanLepage July 5, 2024 18:30
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 5, 2024
Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

Diff LGTM !

@GaetanLepage
Copy link
Contributor

Result of nixpkgs-review pr 317572 run on aarch64-darwin 1

@GaetanLepage
Copy link
Contributor

Result of nixpkgs-review pr 317572 run on x86_64-darwin 1

@GaetanLepage
Copy link
Contributor

Result of nixpkgs-review pr 317572 run on aarch64-linux 1

@GaetanLepage
Copy link
Contributor

Result of nixpkgs-review pr 317572 run on x86_64-linux 1

@SuperSandro2000 SuperSandro2000 merged commit 0bb881b into NixOS:master Jul 6, 2024
@SFrijters SFrijters deleted the ruff-fix-completion branch July 6, 2024 09:49
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: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants