JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dotnet-sdk: Don't add attributes when allowAliases disabled

Browse Source
This commit is contained in:
Silvan Mosberger 2023-12-22 19:32:13 +01:00
parent 7f6b89769e
commit 12e32d6dbb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/dotnet/default.nix
View File

@ -5,7 +5,7 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7
Hashes and urls are retrieved from:
https://dotnet.microsoft.com/download/dotnet
*/
{ callPackage }:
{ lib, config, callPackage }:
let
buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {};
buildAttrs = {
@ -35,7 +35,7 @@ in
inherit systemToDotnetRid;
combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {};
} // lib.optionalAttrs config.allowAliases {
# EOL
sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)";
sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)";

3
pkgs/top-level/aliases.nix
View File

@ -202,6 +202,9 @@ mapAliases ({
dot-http = throw "'dot-http' has been removed: abandoned by upstream. Use hurl instead."; # Added 2023-01-16
dotty = scala_3; # Added 2023-08-20
dotnet-netcore = dotnet-runtime; # Added 2021-10-07
dotnet-sdk_2 = dotnetCorePackages.sdk_2_1; # Added 2020-01-19
dotnet-sdk_3 = dotnetCorePackages.sdk_3_1; # Added 2020-01-19
dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; # Added 2020-09-11
drgeo = throw "'drgeo' has been removed as it is outdated and unmaintained"; # Added 2023-10-15
dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03

3
pkgs/top-level/all-packages.nix
View File

@ -939,9 +939,6 @@ with pkgs;
dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {});
dotnet-sdk_2 = dotnetCorePackages.sdk_2_1;
dotnet-sdk_3 = dotnetCorePackages.sdk_3_1;
dotnet-sdk_5 = dotnetCorePackages.sdk_5_0;
dotnet-sdk_6 = dotnetCorePackages.sdk_6_0;
dotnet-sdk_7 = dotnetCorePackages.sdk_7_0;
dotnet-sdk_8 = dotnetCorePackages.sdk_8_0;