pyrox.dev / nixpkgs
lol
fork atom

mesen: 2.0.0-unstable-2024-12-25 -> 2.0.0-unstable-2025-04-01 (#383102)

authored by Toma and committed by GitHub 8f5c5639 6b566cc7

+106 -85
unified split
+55 -50
pkgs/by-name/me/mesen/deps.json
··· 1 1 [ 2 2 { 3 3 "pname": "Avalonia", 4 - "version": "11.2.0", 5 - "hash": "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q=" 4 + "version": "11.2.4", 5 + "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4=" 6 6 }, 7 7 { 8 8 "pname": "Avalonia.Angle.Windows.Natives", ··· 16 16 }, 17 17 { 18 18 "pname": "Avalonia.BuildServices", 19 - "version": "0.0.29", 20 - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" 19 + "version": "0.0.31", 20 + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" 21 21 }, 22 22 { 23 23 "pname": "Avalonia.Controls.ColorPicker", 24 - "version": "11.2.0", 25 - "hash": "sha256-x6IdcSo3e2Pq/En9/N80HpPblEXSAv51VRlBrF8wlVM=" 24 + "version": "11.2.3", 25 + "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg=" 26 26 }, 27 27 { 28 28 "pname": "Avalonia.Controls.DataGrid", 29 - "version": "11.2.0", 30 - "hash": "sha256-pd/cD82onMZ0iMLl9TOCl35PEvAPbyX2lUj49lrBpOA=" 29 + "version": "11.2.3", 30 + "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM=" 31 31 }, 32 32 { 33 33 "pname": "Avalonia.Controls.ProportionalStackPanel", ··· 46 46 }, 47 47 { 48 48 "pname": "Avalonia.Desktop", 49 - "version": "11.2.0", 50 - "hash": "sha256-+5ISi6WXe8AIjClVo3UqZHgzZpFbMgFk13YvHHhx9MM=" 49 + "version": "11.2.4", 50 + "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo=" 51 51 }, 52 52 { 53 53 "pname": "Avalonia.Diagnostics", 54 - "version": "11.2.0", 55 - "hash": "sha256-k60HGDKnsXiDOnxSH+Hx2ihyqmxSSeWIBJx2XD1ELW0=" 54 + "version": "11.2.3", 55 + "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc=" 56 56 }, 57 57 { 58 58 "pname": "Avalonia.FreeDesktop", 59 - "version": "11.2.0", 60 - "hash": "sha256-u4CQvG6EdsyaHSWa+Y704sDiWZlqbArB0g4gcoCFwQo=" 59 + "version": "11.2.4", 60 + "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk=" 61 61 }, 62 62 { 63 63 "pname": "Avalonia.MarkupExtension", ··· 66 66 }, 67 67 { 68 68 "pname": "Avalonia.Native", 69 - "version": "11.2.0", 70 - "hash": "sha256-fMikurP2RAnOahZkORxuGOKGn5iQ0saZCEYsvoFiFQI=" 69 + "version": "11.2.4", 70 + "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM=" 71 71 }, 72 72 { 73 73 "pname": "Avalonia.ReactiveUI", 74 - "version": "11.2.0", 75 - "hash": "sha256-6GXX1ZA6gS9CpkQnGepx1PFNoKiwcHQyLSK5qOGmjYo=" 74 + "version": "11.2.3", 75 + "hash": "sha256-NqRetBiFg5gNCS8C0J1JJJsZ4sz+w+GoEegGFddBGDg=" 76 76 }, 77 77 { 78 78 "pname": "Avalonia.Remote.Protocol", 79 - "version": "11.2.0", 80 - "hash": "sha256-QwYY3bpShJ1ayHUx+mjnwaEhCPDzTk+YeasCifAtGzM=" 79 + "version": "11.2.3", 80 + "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" 81 + }, 82 + { 83 + "pname": "Avalonia.Remote.Protocol", 84 + "version": "11.2.4", 85 + "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc=" 81 86 }, 82 87 { 83 88 "pname": "Avalonia.Skia", 84 - "version": "11.2.0", 85 - "hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o=" 89 + "version": "11.2.4", 90 + "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI=" 86 91 }, 87 92 { 88 93 "pname": "Avalonia.Themes.Fluent", 89 - "version": "11.2.0", 90 - "hash": "sha256-Ate6KC61pwXmTAk5h1uh7rjwAViuiO/qgAVMl3F1BA8=" 94 + "version": "11.2.4", 95 + "hash": "sha256-CPun/JWFCVoGxgMA510/gMP2ZB9aZJ9Bk8yuNjwo738=" 91 96 }, 92 97 { 93 98 "pname": "Avalonia.Themes.Simple", 94 - "version": "11.2.0", 95 - "hash": "sha256-l88ZX50Nao8wjtRnyZxNFFgRpJ/yxxNki6NY48dyTUg=" 99 + "version": "11.2.3", 100 + "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k=" 96 101 }, 97 102 { 98 103 "pname": "Avalonia.Win32", 99 - "version": "11.2.0", 100 - "hash": "sha256-A9PB6Bt61jLdQlMOkchWy/3BwROgxS9BP8FObs/KFiU=" 104 + "version": "11.2.4", 105 + "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY=" 101 106 }, 102 107 { 103 108 "pname": "Avalonia.X11", 104 - "version": "11.2.0", 105 - "hash": "sha256-EP9cCqriEh8d+Wwyv27QGK/CY6w2LcCjtcIv79PZqkM=" 109 + "version": "11.2.4", 110 + "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk=" 106 111 }, 107 112 { 108 113 "pname": "CommunityToolkit.Mvvm", ··· 156 161 }, 157 162 { 158 163 "pname": "HarfBuzzSharp", 159 - "version": "7.3.0.2", 160 - "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=" 164 + "version": "7.3.0.3", 165 + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" 161 166 }, 162 167 { 163 168 "pname": "HarfBuzzSharp.NativeAssets.Linux", 164 - "version": "7.3.0.2", 165 - "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU=" 169 + "version": "7.3.0.3", 170 + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" 166 171 }, 167 172 { 168 173 "pname": "HarfBuzzSharp.NativeAssets.macOS", 169 - "version": "7.3.0.2", 170 - "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08=" 174 + "version": "7.3.0.3", 175 + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" 171 176 }, 172 177 { 173 178 "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", 174 - "version": "7.3.0.3-preview.2.2", 175 - "hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM=" 179 + "version": "7.3.0.3", 180 + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" 176 181 }, 177 182 { 178 183 "pname": "HarfBuzzSharp.NativeAssets.Win32", 179 - "version": "7.3.0.2", 180 - "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo=" 184 + "version": "7.3.0.3", 185 + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" 181 186 }, 182 187 { 183 188 "pname": "MicroCom.Runtime", ··· 201 206 }, 202 207 { 203 208 "pname": "SkiaSharp", 204 - "version": "2.88.8", 205 - "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" 209 + "version": "2.88.9", 210 + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" 206 211 }, 207 212 { 208 213 "pname": "SkiaSharp.NativeAssets.Linux", 209 - "version": "2.88.8", 210 - "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=" 214 + "version": "2.88.9", 215 + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" 211 216 }, 212 217 { 213 218 "pname": "SkiaSharp.NativeAssets.macOS", 214 - "version": "2.88.8", 215 - "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=" 219 + "version": "2.88.9", 220 + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" 216 221 }, 217 222 { 218 223 "pname": "SkiaSharp.NativeAssets.WebAssembly", 219 - "version": "2.88.8", 220 - "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w=" 224 + "version": "2.88.9", 225 + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" 221 226 }, 222 227 { 223 228 "pname": "SkiaSharp.NativeAssets.Win32", 224 - "version": "2.88.8", 225 - "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=" 229 + "version": "2.88.9", 230 + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" 226 231 }, 227 232 { 228 233 "pname": "Splat",
-16
pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch
··· 1 - diff --git a/UI/UI.csproj b/UI/UI.csproj 2 - index 2a0eb78..74751bc 100644 3 - --- a/UI/UI.csproj 4 - +++ b/UI/UI.csproj 5 - @@ -90,11 +90,6 @@ 6 - <None Remove="Styles\StartupStyles.xaml" /> 7 - <None Remove="Utilities\DipSwitchDefinitions.xml" /> 8 - </ItemGroup> 9 - - <PropertyGroup> 10 - - <RestoreSources> 11 - - https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json 12 - - </RestoreSources> 13 - - </PropertyGroup> 14 - <ItemGroup> 15 - <TrimmerRootAssembly Include="Mesen" /> 16 - <TrimmerRootAssembly Include="AvaloniaEdit" />
+33
pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch
··· 1 + diff --git a/UI/UI.csproj b/UI/UI.csproj 2 + index 7721884..3011ae8 100644 3 + --- a/UI/UI.csproj 4 + +++ b/UI/UI.csproj 5 + @@ -90,11 +90,6 @@ 6 + <None Remove="Styles\StartupStyles.xaml" /> 7 + <None Remove="Utilities\DipSwitchDefinitions.xml" /> 8 + </ItemGroup> 9 + - <PropertyGroup> 10 + - <RestoreSources> 11 + - https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json 12 + - </RestoreSources> 13 + - </PropertyGroup> 14 + <ItemGroup> 15 + <TrimmerRootAssembly Include="Mesen" /> 16 + <TrimmerRootAssembly Include="AvaloniaEdit" /> 17 + @@ -105,13 +100,13 @@ 18 + <TrimmerRootAssembly Include="Dock.Settings" /> 19 + </ItemGroup> 20 + <ItemGroup> 21 + - <PackageReference Include="Avalonia" Version="11.3.999-cibuild0054047-alpha" /> 22 + + <PackageReference Include="Avalonia" Version="11.2.4" /> 23 + <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" /> 24 + - <PackageReference Include="Avalonia.Desktop" Version="11.3.999-cibuild0054047-alpha" /> 25 + + <PackageReference Include="Avalonia.Desktop" Version="11.2.4" /> 26 + <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.2.3" /> 27 + <PackageReference Include="Avalonia.Diagnostics" Version="11.2.3" Condition="'$(OptimizeUi)'!='true'" /> 28 + <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" /> 29 + - <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.999-cibuild0054047-alpha" /> 30 + + <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.4" /> 31 + <PackageReference Include="Dock.Avalonia" Version="11.2.0" /> 32 + <PackageReference Include="Dock.Model.Mvvm" Version="11.2.0" /> 33 + <PackageReference Include="Dotnet.Bundle" Version="*" />
+11 -12
pkgs/by-name/me/mesen/dont-zip-libraries.patch
··· 1 1 diff --git a/UI/Config/ConfigManager.cs b/UI/Config/ConfigManager.cs 2 - index 56c1ff1..ed5fe8a 100644 2 + index c3249cf..96c6ae0 100644 3 3 --- a/UI/Config/ConfigManager.cs 4 4 +++ b/UI/Config/ConfigManager.cs 5 5 @@ -51,7 +51,6 @@ namespace Mesen.Config 6 6 } else { 7 7 homeFolder = DefaultDocumentsFolder; 8 8 } 9 - - Program.ExtractNativeDependencies(homeFolder); 9 + - DependencyHelper.ExtractNativeDependencies(homeFolder); 10 10 _homeFolder = homeFolder; 11 11 Config.Save(); 12 12 } 13 13 diff --git a/UI/Program.cs b/UI/Program.cs 14 - index dfc4ba3..632cef2 100644 14 + index dc923ab..ae7a1cc 100644 15 15 --- a/UI/Program.cs 16 16 +++ b/UI/Program.cs 17 17 @@ -54,8 +54,6 @@ namespace Mesen ··· 19 19 20 20 if(!File.Exists(ConfigManager.GetConfigFile())) { 21 21 - //Could not find configuration file, show wizard 22 - - ExtractNativeDependencies(ConfigManager.HomeFolder); 22 + - DependencyHelper.ExtractNativeDependencies(ConfigManager.HomeFolder); 23 23 App.ShowConfigWindow = true; 24 24 BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnMainWindowClose); 25 25 if(File.Exists(ConfigManager.GetConfigFile())) { ··· 28 28 Task.Run(() => ConfigManager.LoadConfig()); 29 29 30 30 - //Extract core dll & other native dependencies 31 - - ExtractNativeDependencies(ConfigManager.HomeFolder); 31 + - DependencyHelper.ExtractNativeDependencies(ConfigManager.HomeFolder); 32 32 - 33 33 if(CommandLineHelper.IsTestRunner(args)) { 34 34 return TestRunner.Run(args); 35 35 } 36 - @@ -147,7 +142,7 @@ namespace Mesen 36 + @@ -105,7 +100,7 @@ namespace Mesen 37 37 libraryName = libraryName + ".dylib"; 38 38 } 39 39 } ··· 43 43 return IntPtr.Zero; 44 44 } 45 45 diff --git a/UI/UI.csproj b/UI/UI.csproj 46 - index 053d495..2a0eb78 100644 46 + index 67fe57d..65762d3 100644 47 47 --- a/UI/UI.csproj 48 48 +++ b/UI/UI.csproj 49 - @@ -634,7 +634,6 @@ 49 + @@ -637,7 +637,6 @@ 50 50 <EmbeddedResource Include="Debugger\Utilities\LuaScripts\NtscSafeArea.lua" /> 51 51 <EmbeddedResource Include="Debugger\Utilities\LuaScripts\NesPianoRoll.lua" /> 52 52 <EmbeddedResource Include="Debugger\Utilities\LuaScripts\ReverseMode.lua" /> ··· 54 54 <EmbeddedResource Include="Localization\resources.en.xml" WithCulture="false" Type="Non-Resx" /> 55 55 <EmbeddedResource Include="Utilities\DipSwitchDefinitions.xml" /> 56 56 </ItemGroup> 57 - @@ -644,16 +643,5 @@ 57 + @@ -647,16 +646,4 @@ 58 58 </AvaloniaXaml> 59 59 </ItemGroup> 60 60 ··· 62 62 - <Exec Command="cd $(OutDir)&#xD;&#xA;rd Dependencies /s /q&#xD;&#xA;md Dependencies&#xD;&#xA;xcopy /s $(ProjectDir)Dependencies\* Dependencies&#xD;&#xA;copy libHarfBuzzSharp.dll Dependencies&#xD;&#xA;copy libSkiaSharp.dll Dependencies&#xD;&#xA;copy MesenCore.dll Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;del ..\Dependencies.zip&#xD;&#xA;powershell Compress-Archive -Path * -DestinationPath '..\Dependencies.zip' -Force&#xD;&#xA;copy ..\Dependencies.zip $(ProjectDir)" /> 63 63 - </Target> 64 64 - 65 - - <Target Name="PreBuildLinux" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='linux-x64'"> 65 + - <Target Name="PreBuildLinux" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='linux-x64' Or '$(RuntimeIdentifier)'=='linux-arm64'"> 66 66 - <Exec Command="cd $(OutDir)&#xD;&#xA;rm -rf Dependencies&#xD;&#xA;mkdir Dependencies&#xD;&#xA;cp -R $(ProjectDir)/Dependencies/* Dependencies&#xD;&#xA;cp libHarfBuzzSharp.so Dependencies&#xD;&#xA;cp libSkiaSharp.so Dependencies&#xD;&#xA;cp MesenCore.so Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;rm ../Dependencies.zip&#xD;&#xA;zip -r ../Dependencies.zip *&#xD;&#xA;cp ../Dependencies.zip $(ProjectDir)" /> 67 67 - </Target> 68 68 - 69 69 - <Target Name="PreBuildOsx" BeforeTargets="PreBuildEvent" Condition="'$(RuntimeIdentifier)'=='osx-x64' Or '$(RuntimeIdentifier)'=='osx-arm64'"> 70 70 - <Exec Command="cp ./Assets/MesenIcon.icns $(OutDir)&#xD;&#xA;cd $(OutDir)&#xD;&#xA;rm -R Dependencies&#xD;&#xA;mkdir Dependencies&#xD;&#xA;cp -R $(ProjectDir)/Dependencies/* Dependencies&#xD;&#xA;cp libHarfBuzzSharp.dylib Dependencies&#xD;&#xA;cp libSkiaSharp.dylib Dependencies&#xD;&#xA;cp MesenCore.dylib Dependencies&#xD;&#xA;cd Dependencies&#xD;&#xA;rm ../Dependencies.zip&#xD;&#xA;zip -r ../Dependencies.zip *&#xD;&#xA;cp ../Dependencies.zip $(ProjectDir)" /> 71 71 - </Target> 72 - 72 + - 73 73 </Project> 74 -
+7 -7
pkgs/by-name/me/mesen/package.nix
··· 6 6 fetchFromGitHub, 7 7 wrapGAppsHook3, 8 8 gtk3, 9 + libX11, 9 10 SDL2, 10 11 }: 11 12 12 13 buildDotnetModule rec { 13 14 pname = "mesen"; 14 - version = "2.0.0-unstable-2024-12-25"; 15 + version = "2.0.0-unstable-2025-04-01"; 15 16 16 17 src = fetchFromGitHub { 17 18 owner = "SourMesen"; 18 19 repo = "Mesen2"; 19 - rev = "6820db37933002089a04d356d8469481e915a359"; 20 - hash = "sha256-TzGMZr351XvVj/wARWJxRisRb5JlkyzdjCVYbwydBVE="; 20 + rev = "0dfdbbdd9b5bc4c5d501ea691116019266651aff"; 21 + hash = "sha256-+Jzw1tfdiX2EmQIoPuMtLmJrv9nx/XqfyLEBW+AXj1I="; 21 22 }; 22 23 23 24 patches = [ 24 - # the nightly avalonia repository url is still queried, which errors out 25 - # even if we don't actually need any nightly versions 26 - ./dont-use-alternative-restore-sources.patch 25 + # patch out the usage of nightly avalonia builds, since we can't use alternative restore sources 26 + ./dont-use-nightly-avalonia.patch 27 27 # upstream has a weird library loading mechanism, which we override with a more sane alternative 28 28 ./dont-zip-libraries.patch 29 29 ]; ··· 60 60 61 61 nativeBuildInputs = [ SDL2 ]; 62 62 63 - buildInputs = [ SDL2 ]; 63 + buildInputs = [ SDL2 ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ libX11 ]; 64 64 65 65 makeFlags = [ "core" ]; 66 66