From 5b31367e13601a2a2ab3a55ef8bce9dfd1949c27 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 4 Sep 2024 00:48:59 -0300 Subject: [PATCH] buildDotnetModule: move into dotnetCorePackages --- pkgs/development/compilers/dotnet/default.nix | 1 + pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index fec4583bf558..f963c0603536 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -51,6 +51,7 @@ makeScopeWithSplicing' { patchNupkgs = callPackage ./patch-nupkgs.nix {}; nugetPackageHook = callPackage ./nuget-package-hook.nix {}; + buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { }; mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { }; mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9441405e1666..cce11a14c429 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -878,9 +878,8 @@ with pkgs; dotnet-runtime = dotnetCorePackages.runtime_6_0; dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0; - buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { }; - inherit (dotnetCorePackages) mkNugetSource mkNugetDeps; + inherit (dotnetCorePackages) buildDotnetModule mkNugetSource mkNugetDeps; buildDotnetGlobalTool = callPackage ../build-support/dotnet/build-dotnet-global-tool { };