lol

clr-loader: upgrade to .NET 8

authored by

GGG and committed by
Weijia Wang
9255bc2d 0506ebef

+53 -11
+16 -5
pkgs/development/python-modules/clr-loader/default.nix
··· 19 19 inherit version; 20 20 hash = "sha256-AZNIrmtqg8ekBtFFN8J3zs96OlOyY+w0LIHe1YRaZ+4="; 21 21 }; 22 + patches = [ ./dotnet-8-upgrade.patch ]; 22 23 23 24 # This buildDotnetModule is used only to get nuget sources, the actual 24 25 # build is done in `buildPythonPackage` below. 25 26 dotnet-build = buildDotnetModule { 26 - inherit pname version src; 27 + inherit 28 + pname 29 + version 30 + src 31 + patches 32 + ; 27 33 projectFile = [ 28 34 "netfx_loader/ClrLoader.csproj" 29 35 "example/example.csproj" 30 36 ]; 31 37 nugetDeps = ./deps.json; 32 - dotnet-sdk = dotnetCorePackages.sdk_6_0; 38 + dotnet-sdk = dotnetCorePackages.sdk_8_0; 33 39 }; 34 40 in 35 41 buildPythonPackage { 36 - inherit pname version src; 42 + inherit 43 + pname 44 + version 45 + src 46 + patches 47 + ; 37 48 38 49 format = "pyproject"; 39 50 40 - buildInputs = dotnetCorePackages.sdk_6_0.packages ++ dotnet-build.nugetDeps; 51 + buildInputs = dotnetCorePackages.sdk_8_0.packages ++ dotnet-build.nugetDeps; 41 52 42 53 nativeBuildInputs = [ 43 54 setuptools 44 55 setuptools-scm 45 56 wheel 46 - dotnetCorePackages.sdk_6_0 57 + dotnetCorePackages.sdk_8_0 47 58 ]; 48 59 49 60 propagatedBuildInputs = [ cffi ];
+6 -6
pkgs/development/python-modules/clr-loader/deps.json
··· 2 2 { 3 3 "pname": "Microsoft.NETCore.Platforms", 4 4 "version": "1.1.0", 5 - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" 5 + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" 6 6 }, 7 7 { 8 8 "pname": "Microsoft.NETFramework.ReferenceAssemblies", 9 9 "version": "1.0.0", 10 - "sha256": "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9" 10 + "hash": "sha256-6faPQ4jaFY3OGGVk3lZKW+DEZaIOBZ/wHqbiDTsRR1k=" 11 11 }, 12 12 { 13 13 "pname": "Microsoft.NETFramework.ReferenceAssemblies.net461", 14 14 "version": "1.0.0", 15 - "sha256": "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1" 15 + "hash": "sha256-oS7sUMzKBkLmhggqbI6eBqb1OPAipH0TDTaDaBixcwM=" 16 16 }, 17 17 { 18 18 "pname": "Microsoft.NETFramework.ReferenceAssemblies.net47", 19 19 "version": "1.0.0", 20 - "sha256": "00v56phfn01ahf4fq7zanz6hjyzpp00hkkk4a190l0dywrv387i6" 20 + "hash": "sha256-Jh40dua+AQpSUGTOCQG493sJzbfqH+yIgyoA6+A1ZQM=" 21 21 }, 22 22 { 23 23 "pname": "NETStandard.Library", 24 24 "version": "2.0.3", 25 - "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y" 25 + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" 26 26 }, 27 27 { 28 28 "pname": "NXPorts", 29 29 "version": "1.0.0", 30 - "sha256": "02zva596c3vsnlhi1b1391vbfl8a6142dvm61r8j1c70b07916lj" 30 + "hash": "sha256-kpqQDljgsCBRDqbuJkgwClG3dkgjrBAhtXoPZlJR+ws=" 31 31 } 32 32 ]
+31
pkgs/development/python-modules/clr-loader/dotnet-8-upgrade.patch
··· 1 + diff --git a/example/example.csproj b/example/example.csproj 2 + index fd6d566..ed76d15 100644 3 + --- a/example/example.csproj 4 + +++ b/example/example.csproj 5 + @@ -1,6 +1,6 @@ 6 + <Project Sdk="Microsoft.NET.Sdk"> 7 + <PropertyGroup> 8 + - <TargetFrameworks>net60;netstandard20</TargetFrameworks> 9 + + <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks> 10 + <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> 11 + </PropertyGroup> 12 + <ItemGroup> 13 + diff --git a/tests/test_common.py b/tests/test_common.py 14 + index 8a9e36d..8370024 100644 15 + --- a/tests/test_common.py 16 + +++ b/tests/test_common.py 17 + @@ -8,12 +8,12 @@ from pathlib import Path 18 + 19 + @pytest.fixture(scope="session") 20 + def example_netstandard(tmpdir_factory): 21 + - return build_example(tmpdir_factory, "netstandard20") 22 + + return build_example(tmpdir_factory, "netstandard2.0") 23 + 24 + 25 + @pytest.fixture(scope="session") 26 + def example_netcore(tmpdir_factory): 27 + - return build_example(tmpdir_factory, "net60") 28 + + return build_example(tmpdir_factory, "net8.0") 29 + 30 + 31 + def build_example(tmpdir_factory, framework):