diff --git a/pkgs/by-name/kn/knossosnet/deps.json b/pkgs/by-name/kn/knossosnet/deps.json index cdcba8706613..a5b62c2eb37b 100644 --- a/pkgs/by-name/kn/knossosnet/deps.json +++ b/pkgs/by-name/kn/knossosnet/deps.json @@ -504,11 +504,6 @@ "version": "4.7.1", "hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", diff --git a/pkgs/by-name/kn/knossosnet/dotnet-8-upgrade.patch b/pkgs/by-name/kn/knossosnet/dotnet-8-upgrade.patch new file mode 100644 index 000000000000..5ed204921613 --- /dev/null +++ b/pkgs/by-name/kn/knossosnet/dotnet-8-upgrade.patch @@ -0,0 +1,39 @@ +diff --git a/IonKiwi.lz4/IonKiwi.lz4.csproj b/IonKiwi.lz4/IonKiwi.lz4.csproj +index 312984f..804be5c 100644 +--- a/IonKiwi.lz4/IonKiwi.lz4.csproj ++++ b/IonKiwi.lz4/IonKiwi.lz4.csproj +@@ -1,7 +1,7 @@ +  + + +- net60 ++ net8.0 + true + IonKiwi.lz4.managed + 1.0.7 +diff --git a/Knossos.NET/Knossos.NET.csproj b/Knossos.NET/Knossos.NET.csproj +index 501faaa..4b563f1 100644 +--- a/Knossos.NET/Knossos.NET.csproj ++++ b/Knossos.NET/Knossos.NET.csproj +@@ -1,7 +1,7 @@ +  + + WinExe +- net6.0 ++ net8.0 + enable + + copyused +diff --git a/VP.NET/VP.NET.csproj b/VP.NET/VP.NET.csproj +index 11fa155..2eef420 100644 +--- a/VP.NET/VP.NET.csproj ++++ b/VP.NET/VP.NET.csproj +@@ -1,7 +1,7 @@ + + + +- net6.0 ++ net8.0 + enable + enable + diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index 90667c645c27..a29b3135c981 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -17,9 +17,9 @@ buildDotnetModule rec { hash = "sha256-vlSiM6kskV4wfBZF7Rv5ICyqKG0Zhz/iU8kflYOaf0U="; }; - patches = [ ./targetframework.patch ]; + patches = [ ./dotnet-8-upgrade.patch ]; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; nugetDeps = ./deps.json; executables = [ "Knossos.NET" ]; diff --git a/pkgs/by-name/kn/knossosnet/targetframework.patch b/pkgs/by-name/kn/knossosnet/targetframework.patch deleted file mode 100644 index 2802a18053c4..000000000000 --- a/pkgs/by-name/kn/knossosnet/targetframework.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Knossos.NET-0.1.4/IonKiwi.lz4/IonKiwi.lz4.csproj Knossos.NET-0.1.4.new/IonKiwi.lz4/IonKiwi.lz4.csproj ---- Knossos.NET-0.1.4/IonKiwi.lz4/IonKiwi.lz4.csproj 2023-10-18 15:17:20.000000000 -0400 -+++ Knossos.NET-0.1.4.new/IonKiwi.lz4/IonKiwi.lz4.csproj 2024-01-03 17:39:56.809971086 -0500 -@@ -1,7 +1,7 @@ -  - - -- net60 -+ net6.0 - true - IonKiwi.lz4.managed - 1.0.7