From c9e58193d87d9a5a3571febc30f53689f4f69940 Mon Sep 17 00:00:00 2001 From: GGG Date: Wed, 18 Dec 2024 00:05:07 -0300 Subject: [PATCH] inklecate: upgrade to .NET 8 --- .../in/inklecate/dotnet-8-upgrade.patch | 65 +++++++++++++++++++ pkgs/by-name/in/inklecate/package.nix | 16 +++-- 2 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch diff --git a/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch b/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch new file mode 100644 index 000000000000..c16d94d476e6 --- /dev/null +++ b/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch @@ -0,0 +1,65 @@ +diff --git a/InkTestBed/InkTestBed.csproj b/InkTestBed/InkTestBed.csproj +index d729fee..ea3e9e6 100644 +--- a/InkTestBed/InkTestBed.csproj ++++ b/InkTestBed/InkTestBed.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0 ++ net8.0 + true + InkTestBed + InkTestBed +diff --git a/compiler/ink_compiler.csproj b/compiler/ink_compiler.csproj +index a6dd06b..c4708cc 100644 +--- a/compiler/ink_compiler.csproj ++++ b/compiler/ink_compiler.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0 ++ net8.0 + Ink + ink_compiler + +diff --git a/ink-engine-runtime/ink-engine-runtime.csproj b/ink-engine-runtime/ink-engine-runtime.csproj +index caba6df..777c109 100644 +--- a/ink-engine-runtime/ink-engine-runtime.csproj ++++ b/ink-engine-runtime/ink-engine-runtime.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0 ++ net8.0 + Ink.Runtime + ink-engine-runtime + +diff --git a/inklecate/inklecate.csproj b/inklecate/inklecate.csproj +index 0a02264..cf7b254 100644 +--- a/inklecate/inklecate.csproj ++++ b/inklecate/inklecate.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0 ++ net8.0 + Ink + inklecate + +diff --git a/tests/tests.csproj b/tests/tests.csproj +index 8d3bd6b..a9731c5 100644 +--- a/tests/tests.csproj ++++ b/tests/tests.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0 ++ net8.0 + tests + ink-tests + diff --git a/pkgs/by-name/in/inklecate/package.nix b/pkgs/by-name/in/inklecate/package.nix index 26f3c153e113..3c635a6060c1 100644 --- a/pkgs/by-name/in/inklecate/package.nix +++ b/pkgs/by-name/in/inklecate/package.nix @@ -1,8 +1,9 @@ -{ lib -, stdenv -, buildDotnetModule -, dotnetCorePackages -, fetchFromGitHub +{ + lib, + stdenv, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, }: buildDotnetModule rec { @@ -16,14 +17,15 @@ buildDotnetModule rec { hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; }; + patches = [ ./dotnet-8-upgrade.patch ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; projectFile = "inklecate/inklecate.csproj"; nugetDeps = ./deps.json; executables = [ "inklecate" ]; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; meta = with lib; { description = "Compiler for ink, inkle's scripting language";