From a204ca0902136651a04a1176e420b2e4e960373c Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Fri, 11 Feb 2022 16:43:20 +0100 Subject: [PATCH] dotnetenv: move to pkgs/build-support/dotnet --- .../{ => dotnet}/dotnetenv/Wrapper/Wrapper.sln | 0 .../dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs | 0 .../{ => dotnet}/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in | 0 .../dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in | 0 .../{ => dotnet}/dotnetenv/build-solution.nix | 0 pkgs/build-support/{ => dotnet}/dotnetenv/default.nix | 0 pkgs/build-support/{ => dotnet}/dotnetenv/wrapper.nix | 0 pkgs/top-level/all-packages.nix | 8 ++++---- 8 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/build-support/{ => dotnet}/dotnetenv/Wrapper/Wrapper.sln (100%) rename pkgs/build-support/{ => dotnet}/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs (100%) rename pkgs/build-support/{ => dotnet}/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in (100%) rename pkgs/build-support/{ => dotnet}/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in (100%) rename pkgs/build-support/{ => dotnet}/dotnetenv/build-solution.nix (100%) rename pkgs/build-support/{ => dotnet}/dotnetenv/default.nix (100%) rename pkgs/build-support/{ => dotnet}/dotnetenv/wrapper.nix (100%) diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper.sln similarity index 100% rename from pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln rename to pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper.sln diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs similarity index 100% rename from pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs rename to pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in similarity index 100% rename from pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in rename to pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in similarity index 100% rename from pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in rename to pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnet/dotnetenv/build-solution.nix similarity index 100% rename from pkgs/build-support/dotnetenv/build-solution.nix rename to pkgs/build-support/dotnet/dotnetenv/build-solution.nix diff --git a/pkgs/build-support/dotnetenv/default.nix b/pkgs/build-support/dotnet/dotnetenv/default.nix similarity index 100% rename from pkgs/build-support/dotnetenv/default.nix rename to pkgs/build-support/dotnet/dotnetenv/default.nix diff --git a/pkgs/build-support/dotnetenv/wrapper.nix b/pkgs/build-support/dotnet/dotnetenv/wrapper.nix similarity index 100% rename from pkgs/build-support/dotnetenv/wrapper.nix rename to pkgs/build-support/dotnet/dotnetenv/wrapper.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27df57604d9f..c9d80467d4ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -437,10 +437,6 @@ with pkgs; dotfiles = callPackage ../applications/misc/dotfiles { }; - dotnetenv = callPackage ../build-support/dotnetenv { - dotnetfx = dotnetfx40; - }; - dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); dotnet-sdk_2 = dotnetCorePackages.sdk_2_1; @@ -660,6 +656,10 @@ with pkgs; buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { }; + dotnetenv = callPackage ../build-support/dotnet/dotnetenv { + dotnetfx = dotnetfx40; + }; + fetchgx = callPackage ../build-support/fetchgx { }; resolveMirrorURLs = {url}: fetchurl {