ArchiSteamFarm: 5.4.11.4 -> 5.4.12.3, fix update script for web-ui

authored by Sandro Jäckel and committed by Yaya c781bd7a b11e3eb7

+23 -21
+2 -2
pkgs/applications/misc/ArchiSteamFarm/default.nix
··· 11 11 buildDotnetModule rec { 12 12 pname = "ArchiSteamFarm"; 13 13 # nixpkgs-update: no auto update 14 - version = "5.4.11.4"; 14 + version = "5.4.12.5"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "JustArchiNET"; 18 18 repo = "ArchiSteamFarm"; 19 19 rev = version; 20 - hash = "sha256-wgCpUuJ7Xd+M+YLvywSW/sCQG3SfQtHBX1XJTJVVoI8="; 20 + hash = "sha256-iIYA9BnHUfsB4J7VbSLKaRdJHMW/xULJxKfv8atfAd8="; 21 21 }; 22 22 23 23 dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
+5
pkgs/applications/misc/ArchiSteamFarm/deps.nix
··· 71 71 (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) 72 72 (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) 73 73 (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) 74 + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.3"; sha256 = "0njmg2lygnirnfjv9gck2f5lq4ly5rgws9cpf8qj3kwcwxfp0b9s"; }) 75 + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.3"; sha256 = "1ayh85xqdq8rqjk2iqcn7iaczcl7d8qg6bxk0b4rgx59fmsmbqj7"; }) 76 + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.3"; sha256 = "13cjqmf59k895q6gkd5ycl89mnpalckda7rhsdl11jdyr32hsfnv"; }) 77 + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.3"; sha256 = "1pmhd0imh9wlhvbvvwjrpjsqvzagi2ly22nddwr4r0pi234khyz1"; }) 74 78 (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.2"; sha256 = "08g9dpp766racnh90s1sy3ncl291majgq6v2604hfw1f6zkmbjqh"; }) 75 79 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) 76 80 (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) ··· 108 112 (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; sha256 = "1p9xpqzx42s8cdizv6nh15hcjvl2km0rwby66nfkj4cb472l339s"; }) 109 113 (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; sha256 = "0syz7y6wgnxxgjvfqgymn9mnaa5fjy1qp06qnsvh3agr9mvcv779"; }) 110 114 (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) 115 + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.3"; sha256 = "1fls88ffq34j1gr6zay1crm27v3sjs5fa4mvj9akqjq05bxanlhk"; }) 111 116 (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) 112 117 (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) 113 118 (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
+4 -4
pkgs/applications/misc/ArchiSteamFarm/update.sh
··· 1 1 #!/usr/bin/env nix-shell 2 - #!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts nix-prefetch prefetch-npm-deps 2 + #!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts 3 3 set -euo pipefail 4 4 cd "$(dirname "${BASH_SOURCE[0]}")" 5 5 ··· 14 14 fi 15 15 16 16 asf_path=$PWD 17 - pushd ../../../.. 17 + cd ../../../.. 18 18 19 19 if [[ "${1:-}" != "--deps-only" ]]; then 20 20 update-source-version ArchiSteamFarm "$new_version" ··· 22 22 23 23 $(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) 24 24 25 - popd 26 - "$asf_path/web-ui/update.sh" 25 + cd "$asf_path/web-ui" 26 + ./update.sh
+1
pkgs/applications/misc/ArchiSteamFarm/web-ui/.gitignore
··· 1 + package-lock.json
+5 -5
pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
··· 1 1 { lib, fetchFromGitHub, buildNpmPackage, ArchiSteamFarm }: 2 2 3 - buildNpmPackage { 3 + buildNpmPackage rec { 4 4 pname = "asf-ui"; 5 - inherit (ArchiSteamFarm) version; 5 + version = "fceb2fb828cfa420c77dc5cde433fd519a6717d4"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "JustArchiNET"; 9 9 repo = "ASF-ui"; 10 10 # updated by the update script 11 11 # this is always the commit that should be used with asf-ui from the latest asf version 12 - rev = "1d748b6ea01cc2ed7eebb32b4e8f990d8ff5c7d7"; 13 - hash = "sha256-fb6fiZOnQeYzasL/NqCtTQTNOhdmIMG0mymaQ9zKQko="; 12 + rev = version; 13 + hash = "sha256-gMQWly7HN5rIV9r72Qa+gHuBuQMs9sh09od4ja4sRGU="; 14 14 }; 15 15 16 - npmDepsHash = "sha256-xbGSmorPytbsjmcGOnGOYXWryMIwCPJ/ksMkSgSfJWY="; 16 + npmDepsHash = "sha256-UDCQTRpcPDcuvPzlqTu315EkGr5G0+z7qMSsPgYQacA="; 17 17 18 18 installPhase = '' 19 19 runHook preInstall
+6 -10
pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
··· 1 1 #!/usr/bin/env nix-shell 2 - #! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix gnused jq curl 2 + #! nix-shell -I nixpkgs=../../../../.. -i bash -p curl gnused jq common-updater-scripts prefetch-npm-deps 3 3 set -eou pipefail 4 4 5 - cd "$(dirname "$0")" 6 - pushd ../../../../.. 5 + cd "$(dirname "$0")"/../../../../.. 7 6 version=$(nix-instantiate --strict --eval -A ArchiSteamFarm.version | jq -r) 8 - popd 9 - pushd "$(dirname "$0")" 7 + cd - 10 8 ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha) 11 9 12 10 curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json 13 11 14 - # update-source-version doesn't work for some reason 15 - sed -i "s/rev\\s*=\\s*.*/rev = \"$ui\";/" default.nix 16 - sed -i "s/hash\\s*=\\s*.*/hash = \"$(nix-prefetch fetchurl --url "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix 12 + cd - 13 + update-source-version ArchiSteamFarm.ui "$ui" 14 + cd - 17 15 18 16 npmDepsHash=$(prefetch-npm-deps ./package-lock.json) 19 17 sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i default.nix 20 18 21 19 rm package-lock.json 22 - 23 - popd