Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openutau: bump dotnet version 7 -> 8 #340611

Merged
merged 1 commit into from
Nov 25, 2024
Merged

openutau: bump dotnet version 7 -> 8 #340611

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions pkgs/applications/audio/openutau/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Comment on lines +22 to +23
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you drop the patch below, you can remove this as dotnet-sdk and dotnet-runtime are set to .NET 6 in buildDotnetModule by default.


projectFile = "OpenUtau.sln";
nugetDeps = ./deps.nix;
Expand All @@ -37,11 +37,11 @@ buildDotnetModule rec {
# socket cannot bind to localhost on darwin for tests
doCheck = !stdenv.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 \
'<TargetFramework>net6.0</TargetFramework>' \
'<TargetFramework>net7.0</TargetFramework>'
'<TargetFramework>net8.0</TargetFramework>'
Comment on lines 42 to +44
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why we're patching this? .NET 6 is an LTS release and isn't EOL yet.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.NET 6 just went EOL as of Nov. 12. As of now, the defaults for dotnet-sdk and dotnet-runtime still point to .NET 6, but this will likely change soon. I have no idea how long it will take for upstream to update to .NET 8. I would say that the patch is appropriate in this case, but I'm open to further discussion.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The upstream maintainer made a PR that updates to .NET 8: stakira/OpenUtau#1331.


substituteInPlace OpenUtau/Program.cs --replace \
'/usr/bin/fc-match' \
Expand Down Expand Up @@ -70,12 +70,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";
Expand Down