diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-02 18:05:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-02 18:05:41 +0000 |
| commit | a97d52b3484b545c32b0a5a2d35b589fa435a074 (patch) | |
| tree | da17b9079768a4a089dfffcdc25d7fc0f5776bf0 /pkgs/build-support | |
| parent | 12423e2e92378862924e1f4ea3f51364852338b8 (diff) | |
| parent | 863e8630df64e986730651b2f14302da16ca71e4 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/dotnet/build-dotnet-module/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index d3561282d3fda..e721b59decbe4 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -158,7 +158,6 @@ in stdenvNoCC.mkDerivation (args // { ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - -p:RestoreUseStaticGraphEvaluation=true \ --packages "$HOME/nuget_pkgs" \ ${lib.optionalString (dotnetRestoreFlags != []) (builtins.toString dotnetRestoreFlags)} \ ${lib.optionalString (dotnetFlags != []) (builtins.toString dotnetFlags)} diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh index e0522dc95ce57..3ca89fdc095ec 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh @@ -16,7 +16,6 @@ dotnetConfigureHook() { dotnet restore "$project" \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - -p:RestoreUseStaticGraphEvaluation=true \ --source "@nugetSource@/lib" \ ${parallelFlag-} \ "${dotnetRestoreFlags[@]}" \ |