diff options
author | legendofmiracles | 2021-12-30 15:54:27 -0600 |
---|---|---|
committer | legendofmiracles | 2022-01-05 14:09:25 -0600 |
commit | 6ec211a5bcde0e454b09fae06f3d63e260f76444 (patch) | |
tree | 2e7c071cb493537f81779c61ca107ce6ec7459ee /pkgs | |
parent | 5ff685cca51010402ecc50ba412b584697141668 (diff) |
ArchiSteamFarm: support aarch64 in the update script
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/ArchiSteamFarm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix (renamed from pkgs/applications/misc/ArchiSteamFarm/deps-aarch64.nix) | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix (renamed from pkgs/applications/misc/ArchiSteamFarm/deps.nix) | 0 | ||||
-rwxr-xr-x | pkgs/applications/misc/ArchiSteamFarm/updater.sh | 22 |
4 files changed, 16 insertions, 12 deletions
diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 8319b82a4cd0..17672777fed5 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -23,7 +23,7 @@ buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; dotnet-sdk = dotnetCorePackages.sdk_6_0; - nugetDeps = if stdenvNoCC.isAarch64 then ./deps-aarch64.nix else ./deps.nix; + nugetDeps = if stdenvNoCC.isAarch64 then ./deps-aarch64-linux.nix else ./deps-x86_64-linux.nix; projectFile = "ArchiSteamFarm.sln"; executables = [ "ArchiSteamFarm" ]; @@ -49,7 +49,7 @@ buildDotnetModule rec { description = "Application with primary purpose of idling Steam cards from multiple accounts simultaneously"; homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; - platforms = [ "x86_64-linux" "aarch64-linux" "i386-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ SuperSandro2000 lom ]; }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix index 6ccc210015ac..4b0f17e29d77 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix @@ -162,7 +162,6 @@ (fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) (fetchNuGet { pname = "SteamKit2"; version = "2.4.0-Beta.1"; sha256 = "0zvniwx26i721v98ww7nd4091rwv6ij8lm1vwhqwrjd5wq17y05l"; }) - (fetchNuGet { pname = "SteamKit2"; version = "2.4.0"; sha256 = "14hi47zyp3nc21zjc4a7g6cg8zyq41y9gv35vb96yp1lab6kwa9r"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.2.3"; sha256 = "1kx50vliqcqw72aygkm2cs2q82pxdxz17gvz4chz6k858qj4gv0l"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.2.3"; sha256 = "189i1ziv3xkdxpxhkpfx3xfji3iw124s88sqn3ga2vh04fbdak8x"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.2.3"; sha256 = "1r4z1mmgihnmcqb8zd1q6jbz1g72y5ggl833qhmd1q0wnq8awbs8"; }) @@ -206,7 +205,6 @@ (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Async"; version = "5.0.0"; sha256 = "1bc1bfnahyk6y31mrxn7nd071436m94p4r9b2j835pghcqawqfbc"; }) - (fetchNuGet { pname = "System.Linq.Async"; version = "5.1.0"; sha256 = "130311hl9khq1kcq7zd90grmv2f6ncgfi4yzx1fq3p5v5g39xm8n"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix index e86b2f83188b..e86b2f83188b 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix diff --git a/pkgs/applications/misc/ArchiSteamFarm/updater.sh b/pkgs/applications/misc/ArchiSteamFarm/updater.sh index 201260bb6dbc..1de4d6dbfd11 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/updater.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/updater.sh @@ -1,9 +1,9 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_6 -set -eo pipefail +#!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix +set -exo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath ./deps.nix)" +deps_file="$(realpath ./deps)" new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/releases" | jq -r 'map(select(.prerelease == false)) | .[0].tag_name')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" @@ -16,6 +16,7 @@ fi cd ../../../.. update-source-version ArchiSteamFarm "$new_version" store_src="$(nix-build -A ArchiSteamFarm.src --no-out-link)" +platforms="$(nix-instantiate --strict --eval --json -A ArchiSteamFarm.meta.platforms | jq -r .[])" src="$(mktemp -d /tmp/ArchiSteamFarm-src.XXX)" cp -rT "$store_src" "$src" chmod -R +w "$src" @@ -25,12 +26,17 @@ pushd "$src" export DOTNET_NOLOGO=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 -mkdir ./nuget_pkgs +for i in $platforms; do + nix-shell -p dotnet-sdk_6 --argstr system $i --run " + mkdir ./nuget_pkgs-$i + for project in ArchiSteamFarm/ArchiSteamFarm.csproj ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj; do + dotnet restore $project --packages ./nuget_pkgs-$i + done; -for project in ArchiSteamFarm/ArchiSteamFarm.csproj ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj; do - dotnet restore "$project" --packages ./nuget_pkgs -done -nuget-to-nix ./nuget_pkgs > "$deps_file" + nuget-to-nix ./nuget_pkgs-$i > $deps_file-$i.nix" \ + || echo "Did you set up binformat for $i?"; + +done; trap ' popd |