scarab: .NET 6 -> 8 (#361251)

NixOS · Dec 5, 2024 · 8b01c3e · 8b01c3e
2 parents 5009f6e + 492818a
commit 8b01c3e
Show file tree

Hide file tree

Showing 6 changed files with 285 additions and 280 deletions.
diff --git a/pkgs/by-name/sc/scarab/deps.nix b/pkgs/by-name/sc/scarab/deps.nix
diff --git a/pkgs/tools/games/scarab/default.nix → pkgs/by-name/sc/scarab/package.nix b/pkgs/tools/games/scarab/default.nix → pkgs/by-name/sc/scarab/package.nix
@@ -15,21 +15,20 @@ buildDotnetModule rec {
 
   src = fetchFromGitHub {
     owner = "fifty-six";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-z1hmMrfeoYyjVEPPjWvUfKUKsOS7UsocSWMYrFY+/kI=";
+    repo = "scarab";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-z1hmMrfeoYyjVEPPjWvUfKUKsOS7UsocSWMYrFY+/kI=";
   };
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
   nugetDeps = ./deps.nix;
   projectFile = "Scarab/Scarab.csproj";
   testProjectFile = "Scarab.Tests/Scarab.Tests.csproj";
   executables = [ "Scarab" ];
 
-  preConfigureNuGet = ''
-    # This should really be in the upstream nuget.config
-    dotnet nuget add source https://api.nuget.org/v3/index.json \
-      -n nuget.org --configfile NuGet.Config
+  postPatch = ''
+    substituteInPlace Scarab/Scarab.csproj Scarab.Tests/Scarab.Tests.csproj \
+      --replace-fail 'net6.0' 'net8.0'
   '';
 
   runtimeDeps = [
@@ -62,7 +61,7 @@ buildDotnetModule rec {
       name = "scarab";
       exec = "Scarab";
       icon = "scarab";
-      comment = meta.description;
+      comment = "Hollow Knight mod installer and manager";
       type = "Application";
       categories = [ "Game" ];
     })

diff --git a/.../tools/games/scarab/scaling-settings.bash → pkgs/by-name/sc/scarab/scaling-settings.bash b/.../tools/games/scarab/scaling-settings.bash → pkgs/by-name/sc/scarab/scaling-settings.bash
diff --git a/pkgs/tools/games/scarab/update.sh → pkgs/by-name/sc/scarab/update.sh b/pkgs/tools/games/scarab/update.sh → pkgs/by-name/sc/scarab/update.sh