Commit 07271da9 authored by David McFarland's avatar David McFarland
Browse files

dotnet: default to source-built sdk/runtimes

parent 691f0c0f

pkgs/applications/editors/jetbrains/default.nix

+5 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ in 
  zlib,

  python3,

  lldb,

  dotnet-sdk_8,

  dotnetCorePackages,

  maven,

  openssl,

  expat,
@@ -44,6 +44,8 @@ let 


  products = versions.${system} or (throw "Unsupported system: ${system}");



  dotnet-sdk = dotnetCorePackages.sdk_8_0-source;



  package = if stdenv.hostPlatform.isDarwin then ./bin/darwin.nix else ./bin/linux.nix;

  mkJetBrainsProductCore = callPackage package { inherit vmopts; };

  mkMeta = meta: fromSource: {
@@ -188,7 +190,7 @@ rec { 


              for dir in plugins/clion-radler/DotFiles/linux-*; do

                rm -rf $dir/dotnet

                ln -s ${dotnet-sdk_8.unwrapped}/share/dotnet $dir/dotnet

                ln -s ${dotnet-sdk}/share/dotnet $dir/dotnet

              done

            )

          '';
@@ -352,7 +354,7 @@ rec { 


              for dir in lib/ReSharperHost/linux-*; do

                rm -rf $dir/dotnet

                ln -s ${dotnet-sdk_8.unwrapped}/share/dotnet $dir/dotnet

                ln -s ${dotnet-sdk}/share/dotnet $dir/dotnet

              done

            )

          '';

pkgs/by-name/al/alcom/package.nix

+3 −0
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ rustPlatform.buildRustPackage { 
      -p:Deterministic=true

  '';



  # NuGet.targets(156,5): error : Unable to load the service index for source https://api.nuget.org/v3/index.json.

  NuGetAudit = "false";



  passthru = {

    inherit (dotnetBuild) fetch-deps;

  };

pkgs/by-name/av/avalonia/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ let 
  dotnet-sdk =

    with dotnetCorePackages;

    combinePackages [

      sdk_7_0_1xx

      runtime_6_0

      sdk_7_0_1xx-bin

      runtime_6_0-bin

    ];



  npmDepsFile = ./npm-deps.nix;

pkgs/by-name/be/beatsabermodmanager/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ buildDotnetModule rec { 
  };



  dotnet-sdk = with dotnetCorePackages; combinePackages [

    sdk_7_0

    sdk_6_0

    sdk_7_0-bin

    sdk_6_0-bin

  ];



  dotnet-runtime = dotnetCorePackages.runtime_7_0;

  dotnet-runtime = dotnetCorePackages.runtime_7_0-bin;



  projectFile = [ "BeatSaberModManager/BeatSaberModManager.csproj" ];

pkgs/by-name/bi/bicep/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ buildDotnetModule rec { 


  nugetDeps = ./deps.json;



  dotnet-sdk = dotnetCorePackages.sdk_8_0;

  dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin;



  dotnet-runtime = dotnetCorePackages.runtime_8_0;