From 2d5e7eac07e003f0f99f1ea48b96e7a738ec7c85 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Thu, 18 Aug 2022 23:44:02 +0200 Subject: [PATCH] jackett: migrate lockfile generation to fetch-deps --- pkgs/servers/jackett/default.nix | 3 +-- pkgs/servers/jackett/updater.sh | 23 ++--------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 330120bec0b..b0a5e3cf561 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -36,13 +36,12 @@ buildDotnetModule rec { ln -s $out/bin/jackett $out/bin/Jackett || : ln -s $out/bin/Jackett $out/bin/jackett || : ''; + passthru.updateScript = ./updater.sh; meta = with lib; { description = "API Support for your favorite torrent trackers"; homepage = "https://github.com/Jackett/Jackett/"; license = licenses.gpl2Only; maintainers = with maintainers; [ edwtjo nyanloutre purcell ]; - platforms = platforms.all; }; - passthru.updateScript = ./updater.sh; } diff --git a/pkgs/servers/jackett/updater.sh b/pkgs/servers/jackett/updater.sh index 9de6ae3ef46..d39452d2afc 100755 --- a/pkgs/servers/jackett/updater.sh +++ b/pkgs/servers/jackett/updater.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_6 +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -15,23 +15,4 @@ fi cd ../../.. update-source-version jackett "${new_version//v}" -store_src="$(nix-build . -A jackett.src --no-out-link)" -src="$(mktemp -d /tmp/jackett-src.XXX)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" - -pushd "$src" - -export DOTNET_NOLOGO=1 -export DOTNET_CLI_TELEMETRY_OPTOUT=1 - -mkdir ./nuget_pkgs - -for project in src/Jackett.Server/Jackett.Server.csproj src/Jackett.Test/Jackett.Test.csproj; do - dotnet restore "$project" --packages ./nuget_pkgs -done - -nuget-to-nix ./nuget_pkgs > "$deps_file" - -popd -rm -r "$src" +$(nix-build -A jackett.fetch-deps --no-out-link) "$deps_file"