ArchiSteamFarm: 5.1.5.3 -> 5.2.0.9 & ASF-ui: update

pkgs/applications/misc/ArchiSteamFarm/default.nix

@@ -5,20 +5,23 @@
 , libkrb5
 , zlib
 , openssl
+, fetchpatch
 }:
 
 buildDotnetModule rec {
   pname = "archisteamfarm";
-  version = "5.1.5.3";
+  version = "5.2.0.9";
 
   src = fetchFromGitHub {
     owner = "justarchinet";
     repo = pname;
     rev = version;
-    sha256 = "sha256-H038maKHZujmbKhbi8fxsKR/tcSPrcl9L5xnr77yyXg=";
+    sha256 = "sha256-BGd75l/p2rvRR/S8uz25aFws8txBpd60iB0xPbfTngM=";
   };
 
-  dotnet-runtime = dotnetCorePackages.aspnetcore_5_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+
   nugetDeps = ./deps.nix;
 
   projectFile = "ArchiSteamFarm.sln";
@@ -26,17 +29,13 @@ buildDotnetModule rec {
 
   runtimeDeps = [ libkrb5 zlib openssl ];
 
-  # Without this, it attempts to write to the store even though the `--path` flag is supplied.
-  patches = [ ./mutable-customdir.patch ];
-
   doCheck = true;
 
   preInstall = ''
     # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors.
     makeWrapperArgs+=(
-      --add-flags "--path ~/.config/archisteamfarm"
-      --run "mkdir -p ~/.config/archisteamfarm/{config,logs,plugins}"
-      --run "cd ~/.config/archisteamfarm"
+      --run "mkdir -p \"~/.config/archisteamfarm/{config,logs,plugins}\""
+      --set "ASF_PATH" "~/.config/archisteamfarm"
     )
   '';
 

pkgs/applications/misc/ArchiSteamFarm/mutable-customdir.patch

@@ -1,13 +0,0 @@
-diff --git a/ArchiSteamFarm/IPC/ArchiKestrel.cs b/ArchiSteamFarm/IPC/ArchiKestrel.cs
-index 371d305c..701eab3d 100644
---- a/ArchiSteamFarm/IPC/ArchiKestrel.cs
-+++ b/ArchiSteamFarm/IPC/ArchiKestrel.cs
-@@ -76,7 +76,7 @@ internal static class ArchiKestrel {
- 			HostBuilder builder = new();
- #endif
-
--			string customDirectory = Path.Combine(Directory.GetCurrentDirectory(), SharedInfo.WebsiteDirectory);
-+			string customDirectory = AppContext.BaseDirectory;
- 			string websiteDirectory = Directory.Exists(customDirectory) ? customDirectory : Path.Combine(AppContext.BaseDirectory, SharedInfo.WebsiteDirectory);
-
- 			// Set default content root

pkgs/applications/misc/ArchiSteamFarm/updater.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_5
+#!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_6
 set -eo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
@@ -30,7 +30,7 @@ dotnet restore ArchiSteamFarm.sln --packages ./nuget_pkgs
 
 nuget-to-nix ./nuget_pkgs > "$deps_file"
 
-trap ''
+trap '
   popd
   rm -r "$src"
-'' EXIT
+' EXIT

pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix

@@ -11,8 +11,8 @@ let
     repo = "ASF-ui";
     # updated by the update script
     # this is always the commit that should be used with asf-ui from the latest asf version
-    rev = "3be40800a37ff0dbf43dd821af0d7498c23a5a52";
-    sha256 = "0mvpp6pw5ld23f56g6rmgiq4mwwwqhh55dn6zsjdylfj8sqisdx8";
+    rev = "a04540b406599803c9e38923c74f2833157faa08";
+    sha256 = "07br334zm518l10i4hakgpbzwiq2b3xljj996dgfka6dcpw6kipi";
   };
 
 in