From f4b697e6bc05beecf3cedf30bcba3578afb9444f Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Tue, 23 Aug 2022 17:13:50 +0200 Subject: [PATCH] depotdownloader: 2.4.5 -> 2.4.7 --- pkgs/tools/misc/depotdownloader/default.nix | 9 +++++--- pkgs/tools/misc/depotdownloader/deps.nix | 9 +++----- pkgs/tools/misc/depotdownloader/fetch-deps.sh | 22 ------------------- pkgs/tools/misc/depotdownloader/update.sh | 17 ++++++++++++++ 4 files changed, 26 insertions(+), 31 deletions(-) delete mode 100755 pkgs/tools/misc/depotdownloader/fetch-deps.sh create mode 100755 pkgs/tools/misc/depotdownloader/update.sh diff --git a/pkgs/tools/misc/depotdownloader/default.nix b/pkgs/tools/misc/depotdownloader/default.nix index dfe8cbc055e2..1f054fb063a2 100644 --- a/pkgs/tools/misc/depotdownloader/default.nix +++ b/pkgs/tools/misc/depotdownloader/default.nix @@ -6,23 +6,26 @@ buildDotnetModule rec { pname = "depotdownloader"; - version = "2.4.5"; + version = "2.4.7"; src = fetchFromGitHub { owner = "SteamRE"; repo = "DepotDownloader"; rev = "DepotDownloader_${version}"; - sha256 = "0i5qgjnliji1g408ks1034r69vqdmfnzanb0qm7jmyzwww7vwpnh"; + sha256 = "F67bRIIN9aRbcPVFge3o0I9RF5JqHNDlTPhOpwqdADY="; }; projectFile = "DepotDownloader.sln"; nugetDeps = ./deps.nix; + passthru.updateScript = ./update.sh; + meta = with lib; { - broken = stdenv.isDarwin; description = "Steam depot downloader utilizing the SteamKit2 library"; + changelog = "https://github.com/SteamRE/DepotDownloader/releases/tag/DepotDownloader_${version}"; license = licenses.gpl2Only; maintainers = [ maintainers.babbaj ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + mainProgram = "DepotDownloader"; }; } diff --git a/pkgs/tools/misc/depotdownloader/deps.nix b/pkgs/tools/misc/depotdownloader/deps.nix index 2cdb777206be..625d0716eb69 100644 --- a/pkgs/tools/misc/depotdownloader/deps.nix +++ b/pkgs/tools/misc/depotdownloader/deps.nix @@ -1,12 +1,9 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "5.0.0"; sha256 = "0d7sjr89zwq0wxirf8la05hfalv9nhvlczg1c7a508k8aw79jvfg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "5.0.17"; sha256 = "1lc2jhr4ikffi5ylyf8f6ya6k0hdj0wp1l0017grrwd4m5ajj4vv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) - (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) - (fetchNuGet { pname = "SteamKit2"; version = "2.4.0-Alpha.3"; sha256 = "0n48yjkyzj49kv89jbkwdq6nm9w9ng6cjhvdv0chpryx9zgasgvv"; }) + (fetchNuGet { pname = "protobuf-net"; version = "3.1.17"; sha256 = "1pyx9gnzd91m6viph8gyf57l10jspfphczm5m11wriy3ydrzh6yc"; }) + (fetchNuGet { pname = "protobuf-net.Core"; version = "3.1.17"; sha256 = "0gk3zi1iaxssgjw4kdkpj98sy6hyx8m18fijxy413p19zknvnb0n"; }) + (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) ] diff --git a/pkgs/tools/misc/depotdownloader/fetch-deps.sh b/pkgs/tools/misc/depotdownloader/fetch-deps.sh deleted file mode 100755 index 12a18b9996ad..000000000000 --- a/pkgs/tools/misc/depotdownloader/fetch-deps.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../. -i bash -p nuget-to-nix dotnet-sdk -set -eo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" - -deps_file="$(realpath "./deps.nix")" - -cd ../../../.. -store_src="$(nix-build . -A depotdownloader.src --no-out-link)" -src="$(mktemp -d /tmp/depotdownloader-src.XXX)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" - -pushd "$src" - -mkdir ./nuget_tmp.packages -dotnet restore DepotDownloader.sln --packages ./nuget_tmp.packages - -nuget-to-nix ./nuget_tmp.packages > "$deps_file" - -popd -rm -r "$src" diff --git a/pkgs/tools/misc/depotdownloader/update.sh b/pkgs/tools/misc/depotdownloader/update.sh new file mode 100755 index 000000000000..44b6200c4c5d --- /dev/null +++ b/pkgs/tools/misc/depotdownloader/update.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p jq curl common-updater-scripts nix coreutils + +set -eou pipefail + +depsFile="$(realpath "$(dirname "${BASH_SOURCE[0]}")/deps.nix")" +currentVersion="$(nix eval --raw -f . depotdownloader.version)" +latestVersion="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/SteamRE/DepotDownloader/releases?per_page=1" \ + | jq -r '.[].name' | cut -d' ' -f2)" + +if [[ "$currentVersion" = "$latestVersion" ]]; then + echo "Already up to date!" + exit +fi + +update-source-version depotdownloader "$latestVersion" +$(nix-build -A depotdownloader.fetch-deps --no-out-link) "$depsFile"