From 85cfab3dbeabf8bc8b3dd6cd378be06fa00cf047 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 13 Jan 2026 23:26:05 +0000 Subject: [PATCH 1/2] avalonia: 11.3.9 -> 11.3.11 --- pkgs/by-name/av/avalonia/deps.json | 65 +++------------------------- pkgs/by-name/av/avalonia/package.nix | 4 +- 2 files changed, 7 insertions(+), 62 deletions(-) diff --git a/pkgs/by-name/av/avalonia/deps.json b/pkgs/by-name/av/avalonia/deps.json index 7e9cd863612a..9ac49df721a3 100644 --- a/pkgs/by-name/av/avalonia/deps.json +++ b/pkgs/by-name/av/avalonia/deps.json @@ -44,6 +44,11 @@ "version": "2.4.3", "hash": "sha256-pTyYP26uXXLe6ejCb/yVYpb23ad/Dkl2Ka8NWwQeiqk=" }, + { + "pname": "CommunityToolkit.Mvvm", + "version": "8.4.0", + "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI=" + }, { "pname": "dotnet-ilrepack", "version": "1.0.0", @@ -59,16 +64,6 @@ "version": "3.11.0", "hash": "sha256-OLKoHGsBOlGDrwjbSHHITl2mWKbUXoRBbTjNMCkzDQg=" }, - { - "pname": "DynamicData", - "version": "7.12.8", - "hash": "sha256-MIR66d5vWwpOo06b8f3UDJXMlwyiGl/9JsedtVAh6LA=" - }, - { - "pname": "DynamicData", - "version": "8.4.1", - "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4=" - }, { "pname": "GdkSharp", "version": "3.24.24.95", @@ -1020,21 +1015,6 @@ "version": "2.0.9", "hash": "sha256-DLkL5i3q+y2AOg68oe6ROxgcwkPaLg7ViI3pytJd80k=" }, - { - "pname": "ReactiveUI", - "version": "18.4.1", - "hash": "sha256-IqaIu3xmShw3m/ko34SytnL9sIm/LQnTUZcda7CF7tA=" - }, - { - "pname": "ReactiveUI", - "version": "20.1.1", - "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE=" - }, - { - "pname": "ReactiveUI.Validation", - "version": "3.0.22", - "hash": "sha256-f/1yGwrQb/Nauj+0lqBV6xxbfp8qCQvJxbxUy2VhS8I=" - }, { "pname": "runtime.any.System.Collections", "version": "4.0.11", @@ -1790,16 +1770,6 @@ "version": "2.88.9", "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, - { - "pname": "Splat", - "version": "14.5.1", - "hash": "sha256-qv/N4VN3MtCW3t/OJ77NGUMfPON2kHIq5BtrMTQLRUQ=" - }, - { - "pname": "Splat", - "version": "15.1.1", - "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg=" - }, { "pname": "System.AppContext", "version": "4.1.0", @@ -1920,11 +1890,6 @@ "version": "4.5.0", "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" }, - { - "pname": "System.ComponentModel.Annotations", - "version": "5.0.0", - "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" - }, { "pname": "System.ComponentModel.Primitives", "version": "4.3.0", @@ -1980,11 +1945,6 @@ "version": "4.3.1", "hash": "sha256-6vgjSBp0rBpp5qcpCWHNVSUJBzRign1h8cdk4Q75lNw=" }, - { - "pname": "System.Diagnostics.Contracts", - "version": "4.3.0", - "hash": "sha256-K74oyUn0Vriv3mwrbZwQFQ6EA0M7Hm9YlcWLRjLjqr8=" - }, { "pname": "System.Diagnostics.Debug", "version": "4.0.11", @@ -2440,11 +2400,6 @@ "version": "5.0.0", "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE=" }, - { - "pname": "System.Reactive", - "version": "6.0.0", - "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" - }, { "pname": "System.Reactive", "version": "6.0.1", @@ -2930,11 +2885,6 @@ "version": "6.0.0", "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" }, - { - "pname": "System.Text.Encodings.Web", - "version": "8.0.0", - "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" - }, { "pname": "System.Text.Json", "version": "4.7.0", @@ -2945,11 +2895,6 @@ "version": "6.0.0", "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo=" }, - { - "pname": "System.Text.Json", - "version": "8.0.3", - "hash": "sha256-ljBBGkResXv3MbrA14hR6QXo8SFLLV52GkpA+wxKdEo=" - }, { "pname": "System.Text.RegularExpressions", "version": "4.1.0", diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 538b29b58c21..124daceec464 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -46,14 +46,14 @@ stdenvNoCC.mkDerivation ( } rec { pname = "Avalonia"; - version = "11.3.9"; + version = "11.3.11"; src = fetchFromGitHub { owner = "AvaloniaUI"; repo = "Avalonia"; tag = version; fetchSubmodules = true; - hash = "sha256-qvkQKlz9GQayAxCPITYJbCk+w4d9xJNo+P1I9J1SYho="; + hash = "sha256-lB0Td/YmQc8GtTpoinxDYHfxnDLQPTWXsp/X0ddslFM="; }; patches = [ From 3d154373e5a9292f7e914bc3e56a966b3b1fd2fc Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 14 Jan 2026 10:04:22 -0400 Subject: [PATCH 2/2] avalonia: remove dependency on Microsoft.WindowsDesktop.App.Ref --- .../avalonia/0004-disable-windows-desktop.patch | 14 ++++++++++++++ pkgs/by-name/av/avalonia/deps.json | 15 --------------- pkgs/by-name/av/avalonia/package.nix | 3 +++ 3 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 pkgs/by-name/av/avalonia/0004-disable-windows-desktop.patch diff --git a/pkgs/by-name/av/avalonia/0004-disable-windows-desktop.patch b/pkgs/by-name/av/avalonia/0004-disable-windows-desktop.patch new file mode 100644 index 000000000000..b9ad7048b7cc --- /dev/null +++ b/pkgs/by-name/av/avalonia/0004-disable-windows-desktop.patch @@ -0,0 +1,14 @@ +diff --git a/dirs.proj b/dirs.proj +index 28a91c8..cd9b8b4 100644 +--- a/dirs.proj ++++ b/dirs.proj +@@ -22,6 +22,9 @@ + + + ++ ++ ++ + + + diff --git a/pkgs/by-name/av/avalonia/deps.json b/pkgs/by-name/av/avalonia/deps.json index 9ac49df721a3..5ec6c561ffb2 100644 --- a/pkgs/by-name/av/avalonia/deps.json +++ b/pkgs/by-name/av/avalonia/deps.json @@ -875,16 +875,6 @@ "version": "0.11.4-experimental", "hash": "sha256-b3oKUKbr+3Udfl7RWzUY9BR/XWNsN+VmEkBxk6KiFo0=" }, - { - "pname": "Microsoft.WindowsDesktop.App.Ref", - "version": "6.0.36", - "hash": "sha256-K8l2UQgrEOJt6w3Q4Jy7dJlXAI1gG6o+2NEBgmG8dG4=" - }, - { - "pname": "Microsoft.WindowsDesktop.App.Ref", - "version": "8.0.22", - "hash": "sha256-F8DQPfK1IiD8+H8A85QSBHhzJIo1fmAXwXaSge7EhBE=" - }, { "pname": "Mono.Cecil", "version": "0.11.5", @@ -3175,11 +3165,6 @@ "version": "1.4.13", "hash": "sha256-pLtx0/2oTKYO1Y1Vg3k/Eli2OWHT5uorGdBp2uXvFfw=" }, - { - "pname": "Xunit.StaFact", - "version": "1.2.46-alpha", - "hash": "sha256-GkHy4fEg8nvT2K+N/8KDPpJAtwLgVCLERZa5kO08e2E=" - }, { "pname": "YamlDotNet", "version": "11.2.1", diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 124daceec464..19a69b17e4aa 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -65,6 +65,9 @@ stdenvNoCC.mkDerivation ( # Microsoft.Common.CurrentVersion.targets(5034,5): error MSB3021: Unable to copy file "[...]/JetBrains.Annotations.dll" to "bin/Debug/JetBrains.Annotations.dll". Access to the path '/build/source/nukebuild/bin/Debug/JetBrains.Annotations.dll' is denied. [/build/source/nukebuild/_build.csproj] # This happens because the source packages have symlinks due to linkNuGetPackagesAndSources. ./0003-disable-hard-links.patch + # Remove dependencies on Microsoft.WindowsDesktop.App.Ref, which sdk + # specific and currently not packaged in nixpkgs + ./0004-disable-windows-desktop.patch ]; # this needs to be match the version being patched above