From d31d2aab0e52f972e6d451cbe32ccea99dd2c777 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Fri, 11 Feb 2022 16:35:53 +0100 Subject: [PATCH 1/7] buildDotnetModule: move to pkgs/build-support/dotnet --- pkgs/build-support/{ => dotnet}/build-dotnet-module/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/build-support/{ => dotnet}/build-dotnet-module/default.nix (100%) diff --git a/pkgs/build-support/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix similarity index 100% rename from pkgs/build-support/build-dotnet-module/default.nix rename to pkgs/build-support/dotnet/build-dotnet-module/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f30ef8dcf825..ea9f7d574270 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -657,7 +657,7 @@ with pkgs; fetchNuGet = callPackage ../build-support/fetchnuget { }; buildDotnetPackage = callPackage ../build-support/build-dotnet-package { }; - buildDotnetModule = callPackage ../build-support/build-dotnet-module { }; + buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/nuget-to-nix { }; fetchgx = callPackage ../build-support/fetchgx { }; From 8910db35eaad36300ff217d0109fec3e400521c5 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Fri, 11 Feb 2022 16:36:41 +0100 Subject: [PATCH 2/7] buildDotnetPackage: move to pkgs/build-support/dotnet --- .../build-support/{ => dotnet}/build-dotnet-package/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/build-support/{ => dotnet}/build-dotnet-package/default.nix (100%) diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/dotnet/build-dotnet-package/default.nix similarity index 100% rename from pkgs/build-support/build-dotnet-package/default.nix rename to pkgs/build-support/dotnet/build-dotnet-package/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea9f7d574270..cd2c060002e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -656,7 +656,7 @@ with pkgs; fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz {}; fetchNuGet = callPackage ../build-support/fetchnuget { }; - buildDotnetPackage = callPackage ../build-support/build-dotnet-package { }; + buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { }; buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/nuget-to-nix { }; From b2b29319def269c0e542c6e4b080ff0c0a127522 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Fri, 11 Feb 2022 16:37:26 +0100 Subject: [PATCH 3/7] fetchNuGet: move to pkgs/build-support/dotnet --- pkgs/build-support/{ => dotnet}/fetchnuget/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/build-support/{ => dotnet}/fetchnuget/default.nix (100%) diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/dotnet/fetchnuget/default.nix similarity index 100% rename from pkgs/build-support/fetchnuget/default.nix rename to pkgs/build-support/dotnet/fetchnuget/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd2c060002e4..112ae55ab8ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -655,7 +655,7 @@ with pkgs; fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz {}; - fetchNuGet = callPackage ../build-support/fetchnuget { }; + fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { }; buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { }; buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/nuget-to-nix { }; From 1878b7b1b2fd3186e48511ba3a0ea8e3574664fc Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Fri, 11 Feb 2022 16:38:12 +0100 Subject: [PATCH 4/7] nuget-to-nix: move to pkgs/build-support/dotnet --- pkgs/build-support/{ => dotnet}/nuget-to-nix/default.nix | 0 pkgs/build-support/{ => dotnet}/nuget-to-nix/nuget-to-nix.sh | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/build-support/{ => dotnet}/nuget-to-nix/default.nix (100%) rename pkgs/build-support/{ => dotnet}/nuget-to-nix/nuget-to-nix.sh (100%) diff --git a/pkgs/build-support/nuget-to-nix/default.nix b/pkgs/build-support/dotnet/nuget-to-nix/default.nix similarity index 100% rename from pkgs/build-support/nuget-to-nix/default.nix rename to pkgs/build-support/dotnet/nuget-to-nix/default.nix diff --git a/pkgs/build-support/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh similarity index 100% rename from pkgs/build-support/nuget-to-nix/nuget-to-nix.sh rename to pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 112ae55ab8ba..33d15f50dac6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -658,7 +658,7 @@ with pkgs; fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { }; buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { }; buildDotnetModule = callPackage ../build-support/dotnet/build-dotnet-module { }; - nuget-to-nix = callPackage ../build-support/nuget-to-nix { }; + nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { }; fetchgx = callPackage ../build-support/fetchgx { }; From b2b54c980a6d0fe1df731e24fc2fc17aeb755efe Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Fri, 11 Feb 2022 16:42:07 +0100 Subject: [PATCH 5/7] 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 { }; From a204ca0902136651a04a1176e420b2e4e960373c Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Fri, 11 Feb 2022 16:43:20 +0100 Subject: [PATCH 6/7] 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 { From df4a90f4a1b7830668c6d0b0d41947fd5660447b Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Fri, 11 Feb 2022 16:46:31 +0100 Subject: [PATCH 7/7] all-packages: centralise dotnet packages --- pkgs/top-level/all-packages.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9d80467d4ec..c06416105e0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -437,6 +437,8 @@ with pkgs; dotfiles = callPackage ../applications/misc/dotfiles { }; + # Dotnet + dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); dotnet-sdk_2 = dotnetCorePackages.sdk_2_1; @@ -448,6 +450,17 @@ 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 { }; + + dotnetenv = callPackage ../build-support/dotnet/dotnetenv { + dotnetfx = dotnetfx40; + }; + + buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { }; + fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { }; + dotnetbuildhelpers = callPackage ../build-support/dotnet/dotnetbuildhelpers { }; + dumb-init = callPackage ../applications/virtualization/dumb-init {}; umoci = callPackage ../applications/virtualization/umoci {}; @@ -649,17 +662,6 @@ with pkgs; fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz {}; - 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 { }; - - dotnetenv = callPackage ../build-support/dotnet/dotnetenv { - dotnetfx = dotnetfx40; - }; - fetchgx = callPackage ../build-support/fetchgx { }; resolveMirrorURLs = {url}: fetchurl {