diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-15 18:13:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-15 18:13:27 +0000 |
| commit | dfd4f1430301305a0c543f034a95aaae6e3ce09d (patch) | |
| tree | e451a4f3f1defad8765a1bdcee54846f014741fd /pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch | |
| parent | 80e725f3dc9daff0b720b4cb7d7088cdc65e015d (diff) | |
| parent | bc5c0c559f1c93ccea9a7f21066b6314831bea3d (diff) | |
| download | nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.gz nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.bz2 nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.lz nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.xz nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.zst nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch')
| -rw-r--r-- | pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch b/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch new file mode 100644 index 000000000000..1896d6018f05 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch @@ -0,0 +1,23 @@ +diff -Naur terraform.old/command/init.go terraform.new/command/init.go +--- terraform.old/command/init.go ++++ terraform.new/command/init.go +@@ -3,6 +3,7 @@ + import ( + "context" + "fmt" ++ "os" + "log" + "strings" + +@@ -55,6 +56,11 @@ + + var diags tfdiags.Diagnostics + ++ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") ++ if ok { ++ flagPluginPath = append(flagPluginPath, val) ++ } ++ + if len(flagPluginPath) > 0 { + c.pluginPath = flagPluginPath + } |