From b2b54c980a6d0fe1df731e24fc2fc17aeb755efe Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Fri, 11 Feb 2022 16:42:07 +0100 Subject: [PATCH] dotnetbuildhelpers: move to pkgs/build-support/dotnet --- .../dotnetbuildhelpers/create-pkg-config-for-dll.sh | 0 .../{ => dotnet}/dotnetbuildhelpers/default.nix | 0 .../{ => dotnet}/dotnetbuildhelpers/patch-fsharp-targets.sh | 0 .../{ => dotnet}/dotnetbuildhelpers/placate-nuget.sh | 0 .../{ => dotnet}/dotnetbuildhelpers/placate-paket.sh | 0 .../dotnetbuildhelpers/remove-duplicated-dlls.sh | 0 pkgs/top-level/all-packages.nix | 6 +++--- 7 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/build-support/{ => dotnet}/dotnetbuildhelpers/create-pkg-config-for-dll.sh (100%) rename pkgs/build-support/{ => dotnet}/dotnetbuildhelpers/default.nix (100%) rename pkgs/build-support/{ => dotnet}/dotnetbuildhelpers/patch-fsharp-targets.sh (100%) rename pkgs/build-support/{ => dotnet}/dotnetbuildhelpers/placate-nuget.sh (100%) rename pkgs/build-support/{ => dotnet}/dotnetbuildhelpers/placate-paket.sh (100%) rename pkgs/build-support/{ => dotnet}/dotnetbuildhelpers/remove-duplicated-dlls.sh (100%) diff --git a/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh similarity index 100% rename from pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh rename to pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh diff --git a/pkgs/build-support/dotnetbuildhelpers/default.nix b/pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix similarity index 100% rename from pkgs/build-support/dotnetbuildhelpers/default.nix rename to pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix diff --git a/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh similarity index 100% rename from pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh rename to pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh similarity index 100% rename from pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh rename to pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh similarity index 100% rename from pkgs/build-support/dotnetbuildhelpers/placate-paket.sh rename to pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh diff --git a/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh similarity index 100% rename from pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh rename to pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33d15f50dac6..27df57604d9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -441,8 +441,6 @@ with pkgs; dotnetfx = dotnetfx40; }; - dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { }; - dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); dotnet-sdk_2 = dotnetCorePackages.sdk_2_1; @@ -655,8 +653,10 @@ with pkgs; fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz {}; - fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { }; buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { }; + fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { }; + dotnetbuildhelpers = callPackage ../build-support/dotnet/dotnetbuildhelpers { }; + buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { };