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: .NET 6 -> 8 #361251

Merged
merged 5 commits into from
Dec 5, 2024
Merged

scarab: .NET 6 -> 8 #361251

merged 5 commits into from
Dec 5, 2024

Conversation

gepbird
Copy link
Contributor

@gepbird gepbird commented Dec 2, 2024 •
edited
Loading

Closes #360336

Tracking: #326335

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@gepbird gepbird mentioned this pull request Dec 2, 2024
Open
17 tasks
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 2, 2024
@gepbird
Copy link
Contributor Author

gepbird commented Dec 2, 2024

Related to failing nixfmt check: #358025, one of the proposals was to ignore it for generated files.

@gepbird
Copy link
Contributor Author

gepbird commented Dec 2, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 361251

x86_64-linux

✅ 1 package built:
  • scarab

@gepbird gepbird requested a review from huantianad December 3, 2024 08:21
huantianad
huantianad approved these changes Dec 3, 2024
View reviewed changes
Copy link
Contributor

@huantianad huantianad left a comment

Choose a reason for hiding this comment

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

Diff looks good to me, I probably should go test it with the game just to make sure, but I don't expect anything to go wrong.

Might be worth bothering upstream to make a new release with dotnet 8, might do that later.

@ofborg ofborg bot requested a review from huantianad December 3, 2024 11:56
@gepbird
Copy link
Contributor Author

gepbird commented Dec 3, 2024

@huantianad

Diff looks good to me, I probably should go test it with the game just to make sure, but I don't expect anything to go wrong.

Proper testing would be very much appreciated, I only checked that the GUI opens.

Might be worth bothering upstream to make a new release with dotnet 8, might do that later.

fifty-six/Scarab#234

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Dec 3, 2024
@huantianad
Copy link
Contributor

Did a quick test: Fresh steam install of HK, Scarab detected it, and was able to install the modding API + a mod (Benchwarp). Game launched properly and mod was enabled. Disabling and uninstalling the mod also worked.

@gepbird
Copy link
Contributor Author

gepbird commented Dec 4, 2024

cc @corngood @emilazy (#358533)

@corngood corngood self-requested a review December 4, 2024 15:53
@corngood corngood added the backport release-24.11 Backport PR automatically label Dec 4, 2024
@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Dec 5, 2024
@Aleksanaa Aleksanaa added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 5, 2024
@corngood
Copy link
Contributor

corngood commented Dec 5, 2024

Unfortunately this has conflicts due to #355700. @gepbird could you rebase?

@gepbird gepbird force-pushed the scarab-dotnet-bump branch from d83a627 to 492818a Compare December 5, 2024 13:56
@gepbird gepbird removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 5, 2024
@gepbird
Copy link
Contributor Author

gepbird commented Dec 5, 2024

Thanks for the ping @corngood, done.

@corngood
Copy link
Contributor

corngood commented Dec 5, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 361251

x86_64-linux

✅ 1 package built:
  • scarab

@corngood corngood merged commit 8b01c3e into NixOS:master Dec 5, 2024
18 of 20 checks passed
@nix-backports
Copy link

nix-backports bot commented Dec 5, 2024

Successfully created backport PR for release-24.11:

@nix-backports nix-backports bot mentioned this pull request Dec 5, 2024
Merged
1 task
@gepbird gepbird deleted the scarab-dotnet-bump branch December 5, 2024 14:15
@corngood corngood mentioned this pull request Dec 5, 2024
Merged
13 tasks
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

@huantianad huantianad Awaiting requested review from huantianad

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package backport release-24.11 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Build failure: scarab depends on insecure dotnet-runtime-6.0.36
5 participants
@gepbird @huantianad @corngood @wegank @Aleksanaa