From 095d60d45261633e00f2c0828fbf61dba5ba5abe Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Mon, 18 May 2026 11:42:46 +0000 Subject: [PATCH] inklecate: 1.1.1 -> 1.2.1 --- .../in/inklecate/dotnet-8-upgrade.patch | 65 ------------------- pkgs/by-name/in/inklecate/package.nix | 10 ++- 2 files changed, 7 insertions(+), 68 deletions(-) delete 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 deleted file mode 100644 index c16d94d476e6..000000000000 --- a/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch +++ /dev/null @@ -1,65 +0,0 @@ -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 00a10e71d0ae..a94e381ab156 100644 --- a/pkgs/by-name/in/inklecate/package.nix +++ b/pkgs/by-name/in/inklecate/package.nix @@ -8,16 +8,20 @@ buildDotnetModule rec { pname = "inklecate"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "inkle"; repo = "ink"; rev = "v${version}"; - hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; + hash = "sha256-IEYn7GHUTLABGVZH2AYUpbGeuZvUPbwHz5GcuMrRem8="; }; - patches = [ ./dotnet-8-upgrade.patch ]; + postPatch = '' + find . -name "*.csproj" -exec sed -i 's/net6.0/net8.0/g' {} + + find . -name "*.csproj" -exec sed -i 's/netstandard2.0/net8.0/g' {} + + find . -name "*.csproj" -exec sed -i 's/netstandard1.0;//g' {} + + ''; buildInputs = [ (lib.getLib stdenv.cc.cc) ];