From 263ee6e1cb7ee2e9cc2fe3f2b42f24f3c8a10c4b Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 11 Nov 2025 16:00:02 -0400 Subject: [PATCH] dotnet/update.nix: use new url for v10 artifacts (cherry picked from commit d2d69c25b2e087e63091725c9463f9bf39f01bda) --- pkgs/development/compilers/dotnet/10/default.nix | 1 - pkgs/development/compilers/dotnet/update.nix | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dotnet/10/default.nix b/pkgs/development/compilers/dotnet/10/default.nix index 4ddfa0489237..6a62a896edca 100644 --- a/pkgs/development/compilers/dotnet/10/default.nix +++ b/pkgs/development/compilers/dotnet/10/default.nix @@ -6,7 +6,6 @@ callPackage ../dotnet.nix { releaseManifestFile = ./release.json; releaseInfoFile = ./release-info.json; bootstrapSdkFile = ./bootstrap-sdk.nix; - allowPrerelease = true; depsFile = ./deps.json; fallbackTargetPackages = dotnetCorePackages.sdk_10_0-bin.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index d92fc987cbba..dfd6d147d918 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -138,7 +138,9 @@ writeScript "update-dotnet-vmr.sh" '' artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh) eval "$artifactVar" - artifactsUrl=https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz + artifactsUrl=https://builds.dotnet.microsoft.com/${ + if lib.versionAtLeast channel "10" then "dotnet/source-build" else "source-built-artifacts/assets" + }/Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz else artifactsUrl=$(xq -r '.Project.PropertyGroup | map(select(.PrivateSourceBuiltArtifactsUrl))