Skip to content

Commit

Permalink
dotnet: december 2024 update (#362191)
Browse files Browse the repository at this point in the history
  • Loading branch information
corngood authored Dec 6, 2024
2 parents d7873e2 + 73e492d commit fd2d8e3
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 36 deletions.
2 changes: 1 addition & 1 deletion pkgs/development/compilers/dotnet/9/release-info.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"tarballHash": "sha256-reEPkJpoTCoFa4sOw6MOFXDOK4PEbF9iGkRk0Ccpr58=",
"tarballHash": "sha256-LhnsYVr+I+MY0Vu3y86rsAs8j7jNyo06SguY6uZkEcc=",
"artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-rc.2.24474.1.centos.9-x64.tar.gz",
"artifactsHash": "sha256-Cxjdi7vISz2wMT22o4ZOEd9RdmKHI8PO/JgH1YJWsVo="
}
6 changes: 3 additions & 3 deletions pkgs/development/compilers/dotnet/9/release.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": "9.0.0",
"channel": "9.0",
"tag": "v9.0.0",
"sdkVersion": "9.0.100",
"tag": "v9.0.101",
"sdkVersion": "9.0.101",
"runtimeVersion": "9.0.0",
"aspNetCoreVersion": "9.0.0",
"sourceRepository": "https://github.com/dotnet/dotnet",
"sourceVersion": "a2bc464e40415d625118f38fbb0556d1803783ff"
"sourceVersion": "f303476b533b0f90901c0a5e07a3bd2fb68777e3"
}
8 changes: 2 additions & 6 deletions pkgs/development/compilers/dotnet/update.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}:

let
inherit (lib.importJSON releaseManifestFile) channel release;
inherit (lib.importJSON releaseManifestFile) channel tag;

pkg = stdenvNoCC.mkDerivation {
name = "update-dotnet-vmr-env";
Expand Down Expand Up @@ -93,15 +93,11 @@ writeScript "update-dotnet-vmr.sh" ''
tmp="$(mktemp -d)"
trap 'rm -rf "$tmp"' EXIT
echo ${lib.escapeShellArg (toString ./update.sh)} \
-o ${lib.escapeShellArg (toString bootstrapSdkFile)} --sdk foo
cd "$tmp"
curl -fsSL "$releaseUrl" -o release.json
release=$(jq -r .release release.json)
if [[ -z $tag && "$release" == "${release}" ]]; then
if [[ -z $tag && "$tagName" == "${tag}" ]]; then
>&2 echo "release is already $release"
exit
fi
Expand Down
21 changes: 12 additions & 9 deletions pkgs/development/compilers/dotnet/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -281,15 +281,18 @@ update() {
# If patch was not specified, check if the package is already the latest version
# If it is, exit early
if [ "$patch_specified" == false ] && [ -f "$output" ]; then
local current_version
current_version=$(nix-instantiate --eval -E "(import $output { \
buildAspNetCore = { ... }: {}; \
buildNetSdk = { ... }: {}; \
buildNetRuntime = { ... }: {}; \
fetchNupkg = { ... }: {}; \
}).release_${major_minor_underscore}" | jq -r)

if [[ "$current_version" == "$major_minor_patch" ]]; then
local -a versions
IFS= readarray -d '' versions < <(
nix-instantiate --eval --json -E "with (import $output {
buildAspNetCore = { ... }: {};
buildNetSdk = { version, ... }: { inherit version; };
buildNetRuntime = { version, ... }: { inherit version; };
fetchNupkg = { ... }: {};
}); (x: builtins.deepSeq x x) [
runtime_${major_minor_underscore}.version
sdk_${major_minor_underscore}.version
]" | jq --raw-output0 .[])
if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then
echo "Nothing to update."
return
fi
Expand Down
34 changes: 17 additions & 17 deletions pkgs/development/compilers/dotnet/versions/9.0.nix
Original file line number Diff line number Diff line change
Expand Up @@ -204,39 +204,39 @@ in rec {
};

sdk_9_0_1xx = buildNetSdk {
version = "9.0.100";
version = "9.0.101";
srcs = {
linux-arm = {
url = "https://download.visualstudio.microsoft.com/download/pr/526d93c5-bae2-4cfc-a9cf-b2d28d7b5c98/17c926df21958999f74992973837d261/dotnet-sdk-9.0.100-linux-arm.tar.gz";
hash = "sha512-3gbonlWbx2P/Z3O8+FLZFexH8tifTnBluggA2pmrVjV/MUNzkad9cJbkBfYzGGJbDLB09rQQA2++kG/OfzeU6A==";
url = "https://download.visualstudio.microsoft.com/download/pr/fa0fa6b6-8db2-441e-a393-2dd2f5c841b9/19b664790a03e20ce4069449eaa74b21/dotnet-sdk-9.0.101-linux-arm.tar.gz";
hash = "sha512-zfiYnQLkpqoh5oCB6VYxjJTGAVg6dX1etDORnr5/pRjyB6oPWKCe4oz5X0RcSGOGwineaYkUM6SikUXvWWqhpA==";
};
linux-arm64 = {
url = "https://download.visualstudio.microsoft.com/download/pr/6f79d99b-dc38-4c44-a549-32329419bb9f/a411ec38fb374e3a4676647b236ba021/dotnet-sdk-9.0.100-linux-arm64.tar.gz";
hash = "sha512-aERQ5tH3xxH//b8yorhqky0XpR9HQr0npCieMZxbJPZ0NVP8fgrRxxY+RI7VxAzR7PQZiy5oGsxGItjmGTpc8g==";
url = "https://download.visualstudio.microsoft.com/download/pr/93a7156d-01ef-40a1-b6e9-bbe7602f7e8b/3c93e90c63b494972c44f073e15bfc26/dotnet-sdk-9.0.101-linux-arm64.tar.gz";
hash = "sha512-xfnBfd7VEBy0tlrRAzrk2C/FsEMDvc5OthptxH76hCAr1ybQXK8RflNqAb14rXc7jSPL9DvGVeXrmRKxIHjgsQ==";
};
linux-x64 = {
url = "https://download.visualstudio.microsoft.com/download/pr/308f16a9-2ecf-4a42-b8bb-c1233de985fd/be6e87045ab21935bd8bb98ce69026c4/dotnet-sdk-9.0.100-linux-x64.tar.gz";
hash = "sha512-f2m9oEfeH5Uihr4zCl6FgXHe2VLRqiQWnmIhL5CicUnmO2NsiK0xOm4+yGDaMfjFR/9KtoCBA6Bw9/smupnBxw==";
url = "https://download.visualstudio.microsoft.com/download/pr/d74fd2dd-3384-4952-924b-f5d492326e35/e91d8295d4cbe82ba3501e411d78c9b8/dotnet-sdk-9.0.101-linux-x64.tar.gz";
hash = "sha512-kbN+/WQkLl8fPCAl0YPrNOF/OpJxxWAvKd33lIRe7hA3I++VXthpeI6/WnMejdxpMoeZySxkyxGOEyjSWaatAQ==";
};
linux-musl-arm = {
url = "https://download.visualstudio.microsoft.com/download/pr/c77904f4-57f5-46cf-bf99-d0dd1e4b9b3b/d7b454d3500c1a930b38e39a916aa38f/dotnet-sdk-9.0.100-linux-musl-arm.tar.gz";
hash = "sha512-sJIPgOhmp2A86mKKETDfADvF14GCdciliCoxxuTinwcyL8XP2HMziT5BMb2WEw+yOE0AjLrXBAIsiSZ9UmhuBw==";
url = "https://download.visualstudio.microsoft.com/download/pr/5528c94e-1708-4291-917f-c9b693df3389/b851b22328c11e88f9fb61ea3e18582f/dotnet-sdk-9.0.101-linux-musl-arm.tar.gz";
hash = "sha512-fmVg5puDueZJYekRVfhYVCHDos52iXhx04ZJLGI+koD2byKE3Ek2K8OHOeSBclI85UsiaVJENzlOo+kIcooBGA==";
};
linux-musl-arm64 = {
url = "https://download.visualstudio.microsoft.com/download/pr/ca5a82b7-704c-4405-bde2-4bde4b932d2e/0332e51e8d339cbc0410079f911205f3/dotnet-sdk-9.0.100-linux-musl-arm64.tar.gz";
hash = "sha512-2uBtAHMn9vU/UMs6KIS5PNL8u3PHVqisX/ZzYX+b3wAJOTLzqDZSIR/C7rV8JxB4ZE71wopCiX2Dl/dtDolYbQ==";
url = "https://download.visualstudio.microsoft.com/download/pr/a8f1d5c7-c724-451c-8659-fe6ea4e72ea8/1c90dea91c1e117b96198bdccdc0b594/dotnet-sdk-9.0.101-linux-musl-arm64.tar.gz";
hash = "sha512-am1qbW372stIN0wKyb2xyTeB85cMh3iwvuHxWaIrABdoaCZOYFMx/vgzy5/tgptP/UFCdtDRFAqLDiVxlcLzdA==";
};
linux-musl-x64 = {
url = "https://download.visualstudio.microsoft.com/download/pr/404c65f4-7595-4792-85ab-e26084ebb5cf/db570cf4dc8d0a61270243c61fbdf619/dotnet-sdk-9.0.100-linux-musl-x64.tar.gz";
hash = "sha512-4gMua07Zmts6krfgQeqJXuCcbtJFWh9o5V7VO9YTyMIO9KpcQ0OTu1/bwvVjWoMGf3dFH+L9P+vO4mT+B3rNqg==";
url = "https://download.visualstudio.microsoft.com/download/pr/73c11b94-0188-458f-b599-f7591718fc28/c44e21ffbf353b50ef88a76122e89e24/dotnet-sdk-9.0.101-linux-musl-x64.tar.gz";
hash = "sha512-P04U+3tS37V7HjHLWXPm4KM49/Aw8SswgtO1XxL5WH3fSSanxfz4a3ZxOX5E+OXCD7lJ1w6afdDcJ75zpUjf/A==";
};
osx-arm64 = {
url = "https://download.visualstudio.microsoft.com/download/pr/4569c514-16ac-49fc-ac41-4416f547c249/851fb0aa9b2a8bdcb0d1d9f9493a952e/dotnet-sdk-9.0.100-osx-arm64.tar.gz";
hash = "sha512-lN+kllIZWohPBtBs6yPvb31zgP4MQBW5bo+VC1epVYcR+6YRKHEPnI3gCB3ZGvSKkPe9D4uQA4rrWusk+2ck/w==";
url = "https://download.visualstudio.microsoft.com/download/pr/6707b71c-f95b-46b9-a4f8-067922291242/93d5be41bfa39461c47bae856a8ad93c/dotnet-sdk-9.0.101-osx-arm64.tar.gz";
hash = "sha512-xmCO0oDlp2xGzo+bBrjHAUx721SpeVxFhd644FfbTVJAN+ToL5yvMkRO7eQnyctf27ciUI84nviahk8LuuR2ag==";
};
osx-x64 = {
url = "https://download.visualstudio.microsoft.com/download/pr/cab5bf72-f0c7-46c7-a8f2-074f71e4b6ca/a14ec2fc3b6fd32d47b4293994ab3c61/dotnet-sdk-9.0.100-osx-x64.tar.gz";
hash = "sha512-We8yAol5arvcVzA20NG0qhkZyDFAt6NjF0q9aL5cwCUnQVRqIdRsIBWGMx9fkhF4e9GbU4G5AvO9fCJiIDRK6Q==";
url = "https://download.visualstudio.microsoft.com/download/pr/330381bd-72dc-47ba-b5fb-884bd8b0bb44/8f1eef9415fc29a806fbf80a54e28c0e/dotnet-sdk-9.0.101-osx-x64.tar.gz";
hash = "sha512-DBPjCBNI3SvPLgxrhLw3X4BlUPbDibH8phdnrWuQBDAK9yct4Zk1jzKv7ylVE7pexD9fhhTRJDe7iEvo7KTeAQ==";
};
};
inherit commonPackages hostPackages targetPackages;
Expand Down

0 comments on commit fd2d8e3

Please sign in to comment.