From 259e54c4fd159ee515e93f9e7b17e4178e76848c Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 22 Aug 2022 22:04:38 +0200 Subject: [PATCH] jellyfin: migrate lockfile generation to fetch-deps --- pkgs/servers/jellyfin/update.sh | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/jellyfin/update.sh b/pkgs/servers/jellyfin/update.sh index f852bc878487..bbced42742c9 100755 --- a/pkgs/servers/jellyfin/update.sh +++ b/pkgs/servers/jellyfin/update.sh @@ -1,11 +1,8 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts dotnetCorePackages.sdk_6_0 nuget-to-nix gnused nix coreutils findutils +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts gnused nix coreutils set -euo pipefail -export DOTNET_CLI_TELEMETRY_OPTOUT=1 -export DOTNET_NOLOGO=1 - latestVersion="$(curl -s "https://api.github.com/repos/jellyfin/jellyfin/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" currentVersion=$(nix-instantiate --eval -E "with import ./. {}; jellyfin.version or (lib.getVersion jellyfin)" | tr -d '"') @@ -20,22 +17,4 @@ popd update-source-version jellyfin "$latestVersion" -store_src="$(nix-build . -A jellyfin.src --no-out-link)" -src="$(mktemp -d /tmp/jellyfin-src.XXX)" -echo "Temp src dir: $src" -cp -rT "$store_src" "$src" -chmod -R +w "$src" - -pushd "$src" - -mkdir ./nuget_tmp.packages - -dotnet restore Jellyfin.Server --packages ./nuget_tmp.packages --runtime linux-x86 -dotnet restore Jellyfin.Server --packages ./nuget_tmp.packages --runtime linux-x64 -dotnet restore Jellyfin.Server --packages ./nuget_tmp.packages --runtime linux-arm -dotnet restore Jellyfin.Server --packages ./nuget_tmp.packages --runtime linux-arm64 - -nuget-to-nix ./nuget_tmp.packages > "$nugetDepsFile" - -popd -rm -r "$src" +$(nix-build . -A jellyfin.fetch-deps --no-out-link) "$nugetDepsFile"