Skip to content

dotnetCorePackages.fetchNupkg: override avalonia to include upstream fix#340493

Merged
NickCao merged 1 commit intoNixOS:masterfrom
MattSturgeon:avalonia-11.1-fix
Sep 8, 2024
Merged

dotnetCorePackages.fetchNupkg: override avalonia to include upstream fix#340493
NickCao merged 1 commit intoNixOS:masterfrom
MattSturgeon:avalonia-11.1-fix

Conversation

@MattSturgeon
Copy link
Contributor

@MattSturgeon MattSturgeon commented Sep 8, 2024

Description of changes

Backport AvaloniaUI/Avalonia#16835 to versions 11.1.0 through 11.2.0-beta1

These versions have a runtime error when built with dotnet publish --no-build. When attempting to draw a window, Avalonia will throw "No precompiled XAML found".

Upstream

Packages affected

AFAICT these are the only affected packages in nixpkgs, but I included the list of affected release versions anyway to avoid regressions when updating other packages and to aid anyone using nixpkg's dotnet built-support functions outside of nixpkgs.

See #331150 (comment) where this was originally discussed.

cc @corngood @Naxdy @NickCao

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.

@github-actions github-actions bot added the 6.topic: dotnet Language: .NET label Sep 8, 2024
@MattSturgeon MattSturgeon mentioned this pull request Sep 8, 2024
20 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. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Sep 8, 2024
Copy link
Member

@NickCao NickCao 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

@corngood
Copy link
Contributor

corngood commented Sep 8, 2024

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

1 package built:
  • retrospy

Backport AvaloniaUI/Avalonia#16835 to versions
11.1.0 through 11.2.0-beta1

Co-authored-by: Nick Cao <[email protected]>
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.

I confirmed that this fixes retrospy. Thanks!

Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

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

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

1 package built:
  • retrospy

@NickCao NickCao merged commit 9e03cb7 into NixOS:master Sep 8, 2024
@MattSturgeon MattSturgeon deleted the avalonia-11.1-fix branch September 8, 2024 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: dotnet Language: .NET 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. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants