From 134b3796f923c8a533bcb310d0fd485c6c888608 Mon Sep 17 00:00:00 2001 From: r3n3gad3p3arl <20760527+r3n3gad3p3arl@users.noreply.github.com> Date: Sun, 8 Sep 2024 16:49:00 -0500 Subject: [PATCH] openutau: bump dotnet version 7 -> 8 (cherry picked from commit 71b36a1b261c7802c9b94e7dcc99b9e765a7249e) --- pkgs/applications/audio/openutau/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/applications/audio/openutau/default.nix index df53f4a49644a..81caa7b93b720 100644 --- a/pkgs/applications/audio/openutau/default.nix +++ b/pkgs/applications/audio/openutau/default.nix @@ -19,8 +19,8 @@ buildDotnetModule rec { hash = "sha256-HE0KxPKU7tYZbYiCL8sm6I/NZiX0MJktt+5d6qB1A2E="; }; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; # [...]/Microsoft.NET.Sdk.targets(157,5): error MSB4018: The "GenerateDepsFile" task failed unexpectedly. [[...]/OpenUtau.Core.csproj] # [...]/Microsoft.NET.Sdk.targets(157,5): error MSB4018: System.IO.IOException: The process cannot access the file '[...]/OpenUtau.Core.deps.json' because it is being used by another process. [[...]/OpenUtau.Core.csproj] @@ -41,11 +41,11 @@ buildDotnetModule rec { # socket cannot bind to localhost on darwin for tests doCheck = !stdenv.hostPlatform.isDarwin; - # net7.0 replacement needed until upstream bumps to dotnet 7 + # net8.0 replacement needed until upstream bumps to dotnet 8 postPatch = '' substituteInPlace OpenUtau/OpenUtau.csproj OpenUtau.Test/OpenUtau.Test.csproj --replace \ 'net6.0' \ - 'net7.0' + 'net8.0' substituteInPlace OpenUtau/Program.cs --replace \ '/usr/bin/fc-match' \ @@ -74,12 +74,7 @@ buildDotnetModule rec { # some deps and worldline resampler binaryNativeCode ]; - license = with licenses; [ - # dotnet code and worldline resampler binary - mit - # worldline resampler binary - no source is available (hence "unfree") but usage of the binary is MIT - unfreeRedistributable - ]; + license = licenses.mit; maintainers = [ ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "OpenUtau";