Skip to content

Commit

Permalink
Merge pull request #335969 from corngood/dotnet-upgrade
Browse files Browse the repository at this point in the history
dotnet: august 2024 upgrades
  • Loading branch information
corngood authored Aug 23, 2024
2 parents 6de1748 + 858f045 commit 3704dd0
Show file tree
Hide file tree
Showing 15 changed files with 490 additions and 477 deletions.
74 changes: 29 additions & 45 deletions pkgs/by-name/ro/roslyn-ls/deps.nix

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pkgs/by-name/ro/roslyn-ls/package.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ lib, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, stdenvNoCC, testers, roslyn-ls, jq }:
let
pname = "roslyn-ls";
dotnet-sdk = dotnetCorePackages.sdk_9_0;
dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_7_0 sdk_8_0 sdk_9_0 ];
# need sdk on runtime as well
dotnet-runtime = dotnet-sdk;
dotnet-runtime = dotnetCorePackages.sdk_9_0;

project = "Microsoft.CodeAnalysis.LanguageServer";
in
Expand Down
16 changes: 8 additions & 8 deletions pkgs/development/compilers/dotnet/8/deps.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkgs/development/compilers/dotnet/8/release-info.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"tarballHash": "sha256-wZC9fua07CZoHOTTYRjy509sroJWYEu7byS21Co99Xw=",
"artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.106-servicing.24278.1.centos.9-x64.tar.gz",
"artifactsHash": "sha256-PL7Kk9M3VI36KeAT+lSBW+kSHSBJd4rfC5fEpCVFR0w="
"tarballHash": "sha256-/LB6wcJyN25e8+wuBBmnBhdafkczl0LoUX0R/NlUdEU=",
"artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.107-servicing.24317.1.centos.9-x64.tar.gz",
"artifactsHash": "sha256-eduApTyIPz8aVvMCHckVLEJ69/fDLWNtw7EpRq36Qfo="
}
12 changes: 6 additions & 6 deletions pkgs/development/compilers/dotnet/8/release.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": "8.0.7",
"release": "8.0.8",
"channel": "8.0",
"tag": "v8.0.7",
"sdkVersion": "8.0.107",
"runtimeVersion": "8.0.7",
"aspNetCoreVersion": "8.0.7",
"tag": "v8.0.8",
"sdkVersion": "8.0.108",
"runtimeVersion": "8.0.8",
"aspNetCoreVersion": "8.0.8",
"sourceRepository": "https://github.com/dotnet/dotnet",
"sourceVersion": "8be139ddde52d33e24c7d82f813248ff9fc54b97"
"sourceVersion": "e78e8a64f20e61e1fea4f24afca66ad1dc56285f"
}
20 changes: 12 additions & 8 deletions pkgs/development/compilers/dotnet/9/deps.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkgs/development/compilers/dotnet/9/release-info.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"tarballHash": "sha256-9MfRifCL91p9TWgIL5qlKxcn2Hgq4gY7cleQyRvx+Vw=",
"artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.6.24312.1.centos.9-x64.tar.gz",
"artifactsHash": "sha256-I0vw3uDV7xze3p/JutImAvoHw3pH74p+xahCdnEWTWM="
"tarballHash": "sha256-DOBRHD6WnvLoCCm9PwtWqfL5CHR8xK3bU3zHsgmuDAM=",
"artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.7.24380.1.centos.9-x64.tar.gz",
"artifactsHash": "sha256-G1gMBCUMO3BiluShVu4sjLc6nLE9V/taXwIIlSOqhJc="
}
12 changes: 6 additions & 6 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-preview.6",
"release": "9.0.0-preview.7",
"channel": "9.0",
"tag": "v9.0.0-preview.6.24327.7",
"sdkVersion": "9.0.100-preview.6.24328.1",
"runtimeVersion": "9.0.0-preview.6.24327.7",
"aspNetCoreVersion": "9.0.0-preview.6.24328.4",
"tag": "v9.0.0-preview.7.24405.7",
"sdkVersion": "9.0.100-preview.7.24407.1",
"runtimeVersion": "9.0.0-preview.7.24405.7",
"aspNetCoreVersion": "9.0.0-preview.7.24406.2",
"sourceRepository": "https://github.com/dotnet/dotnet",
"sourceVersion": "df2bf85c5dd6f3b834db7ee91d53c5d0b9469ca6"
"sourceVersion": "aecea31eada5f5506de2112d72b3bd238a5317b4"
}
1 change: 1 addition & 0 deletions pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# shellcheck shell=bash disable=SC2154
export MSBUILDALWAYSOVERWRITEREADONLYFILES=1
export MSBUILDTERMINALLOGGER=false

declare -Ag _nugetInputs

Expand Down
Loading

0 comments on commit 3704dd0

Please sign in to comment.