talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

avalonia: 11.0.11 -> 11.3.2

Browse Source
This commit is contained in:
David McFarland 2025-07-06 18:04:30 -03:00
parent 855ba1fd1c
commit 87f2eb609a
5 changed files with 676 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/by-name/av/avalonia/0001-use-files-for-unicode-character-database.patch
View File

@ -1,4 +1,4 @@
From f4c599a48d153d15ccb1879ff511617c8e310515 Mon Sep 17 00:00:00 2001
From 8682dcc3fd46658a9d11b4370ca76881efc69c07 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 10 Aug 2024 23:14:12 -0300
Subject: [PATCH 1/2] use files for unicode character database
@ -8,13 +8,13 @@ Subject: [PATCH 1/2] use files for unicode character database
.../TextFormatting/BiDiTestDataGenerator.cs | 1 -
.../GraphemeBreakClassTrieGenerator.cs | 1 -
.../GraphemeBreakTestDataGenerator.cs | 1 -
.../LineBreakEnumuratorTests.cs | 1 -
.../LineBreakEnumeratorTests.cs | 1 -
.../TextFormatting/UnicodeDataGenerator.cs | 28 +++++++++++++++++--
.../TextFormatting/UnicodeEnumsGenerator.cs | 1 -
7 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
index f6b01d737..bc7278ef8 100644
index d944a6cf5..9ddf500c1 100644
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiClassTestDataGenerator.cs
@@ -3,7 +3,6 @@
@ -26,7 +26,7 @@ index f6b01d737..bc7278ef8 100644
namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
index 28d37130a..5e26edf49 100644
index bdaa8274e..e41f0b08e 100644
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/BiDiTestDataGenerator.cs
@@ -3,7 +3,6 @@
@ -50,7 +50,7 @@ index 1a8d41caa..185b6ea62 100644
using Avalonia.Media.TextFormatting.Unicode;
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs
index 029f8e236..44c2aaf6a 100644
index 891c70b7d..a04eb8b41 100644
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/GraphemeBreakTestDataGenerator.cs
@@ -3,7 +3,6 @@
@ -58,26 +58,26 @@ index 029f8e236..44c2aaf6a 100644
using System.IO;
using System.Linq;
-using System.Net.Http;
using System.Runtime.InteropServices;
using System.Text;
using Avalonia.Base.UnitTests.Media.TextFormatting;
namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
index 3db9a32b6..b8df1f446 100644
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumeratorTests.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumeratorTests.cs
index 38df949d1..cb050d5f4 100644
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumeratorTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/LineBreakEnumeratorTests.cs
@@ -3,7 +3,6 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using System.Net.Http;
using Avalonia.Media.TextFormatting;
using Avalonia.Media.TextFormatting.Unicode;
using Xunit;
using Xunit.Abstractions;
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
index f05a1e574..7e698ae0a 100644
index 3a0255f56..557ff6ea8 100644
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeDataGenerator.cs
@@ -1,16 +1,40 @@
@@ -1,15 +1,39 @@
using System;
using System.Collections.Generic;
using System.IO;
@ -85,7 +85,6 @@ index f05a1e574..7e698ae0a 100644
using System.Text.RegularExpressions;
+using System.Threading.Tasks;
using Avalonia.Media.TextFormatting.Unicode;
using Xunit;
namespace Avalonia.Base.UnitTests.Media.TextFormatting
{
@ -115,13 +114,13 @@ index f05a1e574..7e698ae0a 100644
+
internal static class UnicodeDataGenerator
{
- public const string Ucd = "https://www.unicode.org/Public/15.0.0/ucd/";
- public const string Ucd = "https://www.unicode.org/Public/16.0.0/ucd/";
+ public static readonly string Ucd = Environment.GetEnvironmentVariable("UNICODE_CHARACTER_DATABASE");
public static UnicodeTrie GenerateBiDiTrie(out BiDiDataEntries biDiDataEntries, out Dictionary<int, BiDiDataItem> biDiData)
{
diff --git a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
index 110e57cbd..7073ea508 100644
index 74fe70978..b82808ffc 100644
--- a/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/TextFormatting/UnicodeEnumsGenerator.cs
@@ -2,7 +2,6 @@
@ -133,5 +132,5 @@ index 110e57cbd..7073ea508 100644
namespace Avalonia.Base.UnitTests.Media.TextFormatting
{
--
2.42.2
2.49.0

8
pkgs/by-name/av/avalonia/0002-disable-parallel-compile.patch
View File

@ -1,4 +1,4 @@
From 9ba51df4258d0dc2fe72d4f621d29073eeadc011 Mon Sep 17 00:00:00 2001
From c26ab243c8ab9383d05e1be974090d462b12d3cb Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sun, 11 Aug 2024 00:03:36 -0300
Subject: [PATCH 2/2] disable parallel compile
@ -8,10 +8,10 @@ Subject: [PATCH 2/2] disable parallel compile
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
index e3d5139bf..ce50db574 100644
index c6942e430..137f0710d 100644
--- a/nukebuild/Build.cs
+++ b/nukebuild/Build.cs
@@ -136,12 +136,20 @@ DotNetConfigHelper ApplySettingCore(DotNetConfigHelper c)
@@ -145,12 +145,20 @@ DotNetTestSettings ApplySetting(DotNetTestSettings c, Configure<DotNetTestSettin
ProcessTasks.StartProcess("xcodebuild", args).AssertZeroExitCode();
});
@ -34,5 +34,5 @@ index e3d5139bf..ce50db574 100644
);
});
--
2.42.2
2.49.0

973
pkgs/by-name/av/avalonia/deps.json generated
View File

File diff suppressed because it is too large Load Diff

2
pkgs/by-name/av/avalonia/npm-deps.nix
View File

@ -9,6 +9,6 @@
}
{
path = "src/Browser/Avalonia.Browser/webapp";
hash = "sha256-LTQzT4ycLyGQs9T0sa2k/0wfG1GWCdeH9Wx2KeecOyU=";
hash = "sha256-aHF2enlIpeBi3a7rN0nBI24eztxC4nZC+g+4sRc12b4=";
}
]

20
pkgs/by-name/av/avalonia/package.nix
View File

@ -26,8 +26,7 @@ let
dotnet-sdk =
with dotnetCorePackages;
combinePackages [
sdk_7_0_1xx-bin
runtime_6_0-bin
sdk_8_0_4xx
];
npmDepsFile = ./npm-deps.nix;
@ -47,14 +46,14 @@ stdenvNoCC.mkDerivation (
}
rec {
pname = "Avalonia";
version = "11.0.11";
version = "11.3.2";
src = fetchFromGitHub {
owner = "AvaloniaUI";
repo = "Avalonia";
rev = version;
fetchSubmodules = true;
hash = "sha256-Du8DEsZKl7rnVH9YZKAWTCpEQ/5HrNlgacgK/46kx/o=";
hash = "sha256-b7K8h2hqkLnXj3YIaRKUqlbWsDNhfWCEqH1W8K0lP6g=";
};
patches = [
@ -117,6 +116,12 @@ stdenvNoCC.mkDerivation (
--replace-fail \
'<IsPackable>$(PackAvaloniaNative)</IsPackable>' \
'<IsPackable>true</IsPackable>'
# stop 'Clean' target from removing node_modules
substituteInPlace nukebuild/Build.cs \
--replace-fail \
'Parameters.BuildDirs.ForEach(DeleteDirectory);' \
""
'';
makeCacheWritable = true;
@ -130,7 +135,7 @@ stdenvNoCC.mkDerivation (
# ---> System.ArgumentException: Could not find package 'Microsoft.DotNet.ApiCompat.Tool' using:
# - Project assets file '/build/source/nukebuild/obj/project.assets.json'
# - NuGet packages config '/build/source/nukebuild/_build.csproj'
makeEmptyNupkgInPackages = true;
linkNuGetPackagesAndSources = true;
FONTCONFIG_FILE =
let
@ -144,6 +149,11 @@ stdenvNoCC.mkDerivation (
preConfigure = ''
# closed source (telemetry?) https://github.com/AvaloniaUI/Avalonia/discussions/16878
dotnet remove packages/Avalonia/Avalonia.csproj package Avalonia.BuildServices
# upgrade to fix dependency downgrade
# https://github.com/AvaloniaUI/Avalonia/issues/9603
dotnet add tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj \
package Microsoft.NETCore.App --version 1.1.13 --no-restore
'';
runtimeIds = [ (systemToDotnetRid stdenvNoCC.hostPlatform.system) ];