diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-27 12:01:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 12:01:18 +0000 |
| commit | 9ed58a6fb6e902ed2c36291137b9010dabe11419 (patch) | |
| tree | b39a68434a8a8c9fcfb75ecd69acf31cd624b933 /pkgs/build-support | |
| parent | ce0b1b2db7251ac2054a5c0240d0d5db0d6a5489 (diff) | |
| parent | 6688a347b4adb0ba143a4fb806d7279a18b9bf15 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rwxr-xr-x | pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 d3796f88e449a..c8db14a4d918f 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 @@ -24,7 +24,7 @@ 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/* ]]; then + if [[ $pkg_src != https://api.nuget.org/* ]] && [[ ! -d $pkg_src ]]; 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} |