buildDotnetModule: add support for installing pre-release tools

NixOS · Jan 18, 2025 · 5edf781 · 5edf781
1 parent 005b37d
commit 5edf781
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix
@@ -60,7 +60,7 @@ buildDotnetModule (
       installPhase = ''
         runHook preInstall
 
-        dotnet tool install --tool-path $out/lib/${pname} ${nugetName}
+        dotnet tool install --tool-path $out/lib/${pname} ${nugetName} --version ${version}
 
         # remove files that contain nix store paths to temp nuget sources we made
         find $out -name 'project.assets.json' -delete

diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/update.sh b/pkgs/build-support/dotnet/build-dotnet-global-tool/update.sh
@@ -14,7 +14,7 @@ nugetName=$(nixeval "$attr.nupkg.pname")
 
 # always skip prerelease versions for now
 version=$(curl -fsSL "https://api.nuget.org/v3-flatcontainer/$nugetName/index.json" |
-    jq -er '.versions | last(.[] | select(match("^[0-9]+\\.[0-9]+\\.[0-9]+$")))')
+    jq -er '.versions | last(.[] | select(match("^[0-9]+\\.[0-9]+\\.[0-9]+(-[0-9A-Za-z.-]+)?(\\+[0-9A-Za-z.-]+)?$")))')
 
 if [[ $version == $(nixeval "$attr.version") ]]; then
     echo "$attr" is already version "$version"