From c91f7dd64abc65f600c3e047b7b558c49b605012 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 5 Sep 2022 19:04:08 -0300 Subject: [PATCH] nuget-to-nix: skip local packages --- pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index ca0a63b3cd20..5685b0f62bd9 100755 --- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh +++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -30,7 +30,9 @@ while read pkg_spec; do pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" pkg_src="$(jq --raw-output '.source' "$(dirname "$pkg_spec")/.nupkg.metadata")" - if [[ $pkg_src != https://api.nuget.org/* ]] && [[ ! -d $pkg_src ]]; then + if [[ -d $pkg_src ]]; then + continue + elif [[ $pkg_src != https://api.nuget.org/* ]]; then pkg_source_url="${nuget_sources_cache[$pkg_src]:=$(curl -n --fail "$pkg_src" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')}" pkg_url="$pkg_source_url${pkg_name,,}/${pkg_version,,}/${pkg_name,,}.${pkg_version,,}.nupkg" echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; url = \"$pkg_url\"; })" >> ${tmpfile}