From d4776214f794ebeb96d3ba49be4dfa119ef7358a Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 3 Sep 2024 23:01:00 -0300 Subject: [PATCH] mkNugetSource/Deps: move into dotnetCorePackages --- pkgs/development/compilers/dotnet/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 9a1acf4ad70d..0604e5706b02 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -51,6 +51,9 @@ makeScopeWithSplicing' { patchNupkgs = callPackage ./patch-nupkgs.nix {}; nugetPackageHook = callPackage ./nuget-package-hook.nix {}; + mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { }; + mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; + dotnet_8 = recurseIntoAttrs (callPackage ./8 { bootstrapSdk = dotnet_8_0.sdk_8_0_1xx; }); dotnet_9 = recurseIntoAttrs (callPackage ./9 {}); } // lib.optionalAttrs config.allowAliases { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e69ca4d78f5b..9441405e1666 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -880,8 +880,7 @@ with pkgs; buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { }; - mkNugetSource = callPackage ../build-support/dotnet/make-nuget-source { }; - mkNugetDeps = (newScope dotnetCorePackages) ../build-support/dotnet/make-nuget-deps { }; + inherit (dotnetCorePackages) mkNugetSource mkNugetDeps; buildDotnetGlobalTool = callPackage ../build-support/dotnet/build-dotnet-global-tool { };