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

scarab: fix crash (#345038), don't bundle tests #346074

Merged
merged 2 commits into from
Oct 3, 2024
Merged

scarab: fix crash (#345038), don't bundle tests #346074

merged 2 commits into from
Oct 3, 2024

Conversation

huantianad
Copy link
Contributor

@huantianad huantianad commented Oct 3, 2024 •
edited by corngood
Loading

By using testProjectFile, we can properly build the test and run it in
checkPhase, as well as not include the test in the derivation output.

This also happens to fix the startup crash as described in #345038.

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.

@huantianad
scarab: format with nixfmt
718581f
@huantianad
scarab: fix crash (NixOS#345038), don't bundle tests
2edfaf4 
By using testProjectFile, we can properly build the test and run it in
checkPhase, as well as not include the test in the derivation output.

This also happens to fix the startup crash as described in NixOS#345038.
@huantianad
Copy link
Contributor Author

@l0b0 same changes as I mentioned in the issue, not sure if you'd like to test again.
@corngood Thank you so much for your time and help with this issue!

@corngood corngood self-requested a review October 3, 2024 13:37
@corngood
Copy link
Contributor

corngood commented Oct 3, 2024

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

1 package built:
  • scarab

corngood
corngood approved these changes Oct 3, 2024
View reviewed changes
Copy link
Contributor

@corngood corngood left a comment

Choose a reason for hiding this comment

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

Looks good. Sorry for not noticing this breakage. I wonder if we could catch this sort of thing in a test?

@corngood corngood merged commit 553f779 into NixOS:master Oct 3, 2024
45 checks passed
@huantianad huantianad deleted the scarab-fix branch October 3, 2024 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@corngood corngood corngood approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@huantianad @corngood