From 163844f3131b5234369c5a8dd216e6e249b85da3 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Tue, 6 Jun 2023 19:28:56 +0200 Subject: ArchiSteamFarm: 5.4.5.2 -> 5.4.6.3 --- pkgs/applications/misc/ArchiSteamFarm/default.nix | 6 ++---- pkgs/applications/misc/ArchiSteamFarm/deps.nix | 12 ++++++------ pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix | 6 +++--- pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh | 14 ++++---------- 4 files changed, 15 insertions(+), 23 deletions(-) (limited to 'pkgs/applications/misc/ArchiSteamFarm') diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 85e3ba805ccbe..591dc738e916f 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildDotnetModule , fetchFromGitHub , dotnetCorePackages @@ -7,19 +6,18 @@ , zlib , openssl , callPackage -, stdenvNoCC }: buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.4.5.2"; + version = "5.4.6.3"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-l3qcdgTTpbI4Jdy1jpzyCiAFglJfzBHkb6hLIZ4hDKQ="; + hash = "sha256-TAGb3LPS0Jpm3dGGkQbrtTBFCE/xos2ZbNq5UwnrGZY="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 89995685b4c84..8c4bbf9c686b9 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -61,7 +61,7 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.0"; sha256 = "02s98d8nwz5mg4mymcr86qdamy71a29g2091xg452czmd3s3x2di"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) @@ -71,14 +71,14 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.0"; sha256 = "1bnwpwg7k72z06027ip4yi222863r8sv14ck9nj8h64ckiw2r256"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.0"; sha256 = "1rz22chnis11dwjrqrcvvmfw80fi2a7756a7ahwy6jlnr250zr61"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.0"; sha256 = "16vpicp4q2kbpgr3qwpsxg7srabxqszx23x6smjvvrvz7qmr5v8i"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.2"; sha256 = "1pzn95nhmprfvchwshyy87jifzjpvdny21b5yhkqafr150nxlz77"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.2"; sha256 = "1yiwi0hi8pn9dv90vz1yw13izap8dv13asxvr9axcliis0ad5iaq"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.3"; sha256 = "12f5h28115vv7j17whq7f9fwnww3p7iwfbkq3m24m0si303cgqbw"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.3"; sha256 = "0d9nmgj97qpd4w8x609amcawmcywm2q0r2w1p2hvyah0p5s9m0f3"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index d158f60f4539e..783a9fe3b6bc4 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -9,11 +9,11 @@ buildNpmPackage { 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 = "114c390c92a889b86cf560def28fb8f39bc4fe54"; - sha256 = "1ajmi2l6xhv3nlnag2kmkblny925irp4gngdc3mniiimw364p826"; + rev = "3078d92e8b8d79571b771f452a53d1789330c541"; + hash = "sha256-K3YTgsde9aqtmKuFKjXpoWe6USGpKBlC6eeazuOYTqk="; }; - npmDepsHash = "sha256-AY1DFuZkB8tOQd2FzHuNZ31rtLlWujP+3AqsMMB2BhU="; + npmDepsHash = "sha256-L+aWsGMUmIsPJRQ4XPg8WOWOqHKcfDQTqUK+vGBHi0Y="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh index a0c296900e39f..7f026383383df 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh @@ -10,20 +10,14 @@ pushd "$(dirname "$0")" ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha) curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json -curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package.json" -o package.json # update-source-version doesn't work for some reason sed -i "s/rev\\s*=\\s*.*/rev = \"$ui\";/" default.nix -sed -i "s/sha256\\s*=\\s*.*/sha256 = \"$(nix-prefetch-url --unpack "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix +sed -i "s/hash\\s*=\\s*.*/hash = \"$(nix-prefetch fetchurl --url "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix -node2nix \ - --nodejs-14 \ - --development \ - --lock package-lock.json \ - --node-env ../../../../development/node-packages/node-env.nix \ - --output node-packages.nix \ - --composition node-composition.nix \ +npmDepsHash=$(prefetch-npm-deps ./package-lock.json) +sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i default.nix -rm package.json package-lock.json +rm package-lock.json popd -- cgit 1.4.1