diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2021-11-09 10:52:16 +0100 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2021-11-09 11:49:04 +0100 |
| commit | 15db090295ab8f7fa147eddd955ef1172fc4c694 (patch) | |
| tree | 22b325fe067a2be49ad3e14177d9209353c7f918 | |
| parent | 2bcc4707e86f791167f78784e5ecba218a99218d (diff) | |
| download | nixpkgs-15db090295ab8f7fa147eddd955ef1172fc4c694.tar nixpkgs-15db090295ab8f7fa147eddd955ef1172fc4c694.tar.gz nixpkgs-15db090295ab8f7fa147eddd955ef1172fc4c694.tar.bz2 nixpkgs-15db090295ab8f7fa147eddd955ef1172fc4c694.tar.lz nixpkgs-15db090295ab8f7fa147eddd955ef1172fc4c694.tar.xz nixpkgs-15db090295ab8f7fa147eddd955ef1172fc4c694.tar.zst nixpkgs-15db090295ab8f7fa147eddd955ef1172fc4c694.zip | |
dotnet: make SDK 6.0 default
should not cause any trouble since all packages should use pinned versions via either of these: - `dotnet-sdk = dotnetCorePackages.sdk_5_0` - `dotnet-sdk_5`
| -rw-r--r-- | pkgs/development/compilers/dotnet/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 62a08b145bf..7070243945c 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -17,9 +17,9 @@ rec { # EOL - sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 3.1 (LTS) or 5.0 (Current)"; - sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS) or 5.0 (Current)"; - sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS) or 5.0 (Current)"; + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; # v3.1 (LTS) @@ -79,7 +79,7 @@ rec { }; }; - # v6.0 + # v6.0 (LTS) aspnetcore_6_0 = buildAspNetCore { version = "6.0.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92672fef81a..ce710a3c886 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -422,9 +422,9 @@ with pkgs; dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; dotnet-sdk_6 = dotnetCorePackages.sdk_6_0; - dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-runtime = dotnetCorePackages.runtime_5_0; - dotnet-aspnetcore = dotnetCorePackages.aspnetcore_5_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0; dumb-init = callPackage ../applications/virtualization/dumb-init {}; |